[workspace-commit] [nimbusproject/nimbus] b52591: testing commit

noreply at github.com noreply at github.com
Wed Aug 31 16:23:02 CDT 2011


  Branch: refs/heads/gsocadmintools
  Home:   https://github.com/nimbusproject/nimbus

  Commit: b525912b273a15ab9b919431af4c7b7ebd8fd9ed
      https://github.com/nimbusproject/nimbus/commit/b525912b273a15ab9b919431af4c7b7ebd8fd9ed
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    A service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminTools.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminTools.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java
  A service/service/java/tests/suites/basic/src/org/globus/workspace/testing/suites/basic/AdminToolsSuite.java

  Log Message:
  -----------
  testing commit


  Commit: 3348ed65d220521c6e6e67e61d1c1114fed49dbf
      https://github.com/nimbusproject/nimbus/commit/3348ed65d220521c6e6e67e61d1c1114fed49dbf
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-01 (Wed, 01 Jun 2011)

  Changed paths:
    R service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminTools.java

  Log Message:
  -----------
  updating src


  Commit: b66d960a42a01eb95f105406e38237289cc8d898
      https://github.com/nimbusproject/nimbus/commit/b66d960a42a01eb95f105406e38237289cc8d898
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-13 (Mon, 13 Jun 2011)

  Changed paths:
    A home/bin/nimbus-admin
  M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/etc/workspace-service/admin.conf
  M service/service/java/source/etc/workspace-service/other/main.xml
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminClient.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/client/RMIConfig.java
  R service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminTools.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java
  A tests/cc-nimbusAdmin-test.py

  Log Message:
  -----------
  First commit of nimbus-admin tools method. Run bin/nimbus-admin to use.


  Commit: 2c9a85c6404c1169e414ecab5ba82c1d00298ebc
      https://github.com/nimbusproject/nimbus/commit/2c9a85c6404c1169e414ecab5ba82c1d00298ebc
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-13 (Mon, 13 Jun 2011)

  Changed paths:
    M .gitignore
  A .idea-modules/service-suites/failure.iml
  M .idea/libraries/test_libs.xml
  M .idea/misc.xml
  M .idea/modules.xml
  M cloud-client/README.txt
  M cloud-client/builder/environment.sh
  M control/src/python/workspacecontrol/defaults/imageprocurement/propagate_common.py
  M control/src/python/workspacecontrol/main/main_tests.py
  A control/src/python/workspacecontrol/mocks/etc/httpenabled.conf
  M cumulus/reqs.txt
  M docs/src/admin/reference.html
  M docs/src/admin/troubleshooting.html
  M docs/src/admin/z2c/vmm-kvm-notes.html
  M docs/src/admin/z2c/vmm-setup.html
  M docs/src/dev/cumulus_integration.txt
  M docs/src/dev/reference.html
  M install
  M lantorrent/setup-vmm.py
  M lantorrent/setup.py
  R lib/test/testng-5.12.1.jar
  R lib/test/testng-5.12.jar
  A lib/test/testng-6.0.1.jar
  M libexec/create-nimbus-home
  R scripts/README.txt
  R scripts/all-build-and-install.sh
  R scripts/all-build.sh
  R scripts/all-clean.sh
  R scripts/all-install.sh
  R scripts/all-uninstall.sh
  R scripts/broker-build-and-install.sh
  R scripts/broker-build.sh
  R scripts/broker-install.sh
  R scripts/clients-only-build-and-install.sh
  R scripts/clients-only-build.sh
  R scripts/clients-only-install.sh
  R scripts/delete-persistence-directory.sh
  A scripts/gt/README.txt
  A scripts/gt/all-build-and-install.sh
  A scripts/gt/all-build.sh
  A scripts/gt/all-clean.sh
  A scripts/gt/all-install.sh
  A scripts/gt/all-uninstall.sh
  A scripts/gt/broker-build-and-install.sh
  A scripts/gt/broker-build.sh
  A scripts/gt/broker-install.sh
  A scripts/gt/clients-only-build-and-install.sh
  A scripts/gt/clients-only-build.sh
  A scripts/gt/clients-only-install.sh
  A scripts/gt/delete-persistence-directory.sh
  A scripts/gt/stubs-build.sh
  A scripts/integration-suites.sh
  R scripts/stubs-build.sh
  M service/service/java/source/src/org/globus/workspace/WorkspaceConstants.java
  M service/service/java/source/src/org/globus/workspace/WorkspaceUtil.java
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestManager.java
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestManagerImpl.java
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestMap.java
  M service/service/java/source/src/org/globus/workspace/creation/defaults/IdempotentInstanceResource.java
  M service/service/java/source/src/org/globus/workspace/manager/DelegatingManager.java
  M service/service/java/source/src/org/globus/workspace/persistence/DataConvert.java
  M service/service/java/source/src/org/globus/workspace/scheduler/defaults/DefaultSchedulerAdapter.java
  M service/service/java/source/src/org/globus/workspace/scheduler/defaults/DefaultSlotManagement.java
  M service/service/java/source/src/org/globus/workspace/service/InstanceResource.java
  M service/service/java/source/src/org/globus/workspace/service/Sweepable.java
  M service/service/java/source/src/org/globus/workspace/service/impls/InstanceResourceImpl.java
  M service/service/java/source/src/org/globus/workspace/service/impls/ResourceSweeper.java
  M service/service/java/source/src/org/globus/workspace/service/impls/StateTransition.java
  M service/service/java/source/src/org/globus/workspace/service/impls/StatefulResourceImpl.java
  M service/service/java/source/src/org/globus/workspace/service/impls/WorkspaceHomeImpl.java
  M service/service/java/source/src/org/globus/workspace/service/impls/async/RequestFactoryImpl.java
  M service/service/java/source/src/org/globus/workspace/service/impls/async/ResourceMessage.java
  M service/service/java/source/src/org/globus/workspace/xen/XenTask.java
  A service/service/java/source/src/org/globus/workspace/xen/xenssh/MockShutdownTrash.java
  A service/service/java/tests/suites/basic/BasicSuite.xml
  A service/service/java/tests/suites/basic/DirtiesContextExampleSuite.xml
  A service/service/java/tests/suites/basic/IdemptotentCreationSuite.xml
  A service/service/java/tests/suites/basic/Issue37Suite.xml
  A service/service/java/tests/suites/basic/NodeManagementSuite.xml
  A service/service/java/tests/suites/basic/ParallelIdempotentCreationSuite.xml
  R service/service/java/tests/suites/basic/home/var/run/privileged/.keep
  A service/service/java/tests/suites/build.properties
  A service/service/java/tests/suites/build.xml
  M service/service/java/tests/suites/common/src/org/globus/workspace/testing/NimbusTestBase.java
  M service/service/java/tests/suites/common/src/org/globus/workspace/testing/utils/ReprPopulator.java
  A service/service/java/tests/suites/failure/TerminateSuite.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/elastic.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/README.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/main.conflocator.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/main.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/other-elastic.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/query/other/main.conflocator.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/query/other/main.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/query/query.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/accounting.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/admin.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/async.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/cumulus.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/global-policies.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/README.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group01.properties
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group01.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group02.properties
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group02.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group03.properties
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group03.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group04.properties
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/group-authz/group04.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/logging.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/metadata.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/network-pools/private
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/network-pools/public
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/network.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/README.txt
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/authz-callout-ACTIVE.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/authz-callout-disabled.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/authz-callout-groupauthz.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/authz-callout-python.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/common.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/main.repr.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/main.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/resource-locator-ACTIVE.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/resource-locator-default.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/resource-locator-pilot.xml
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/shared-secret-suggestion.py
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/pilot-authz.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/pilot.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/repository.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/ssh.conf
  A service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/vmm.conf
  A service/service/java/tests/suites/failure/home/services/lib-native
  A service/service/java/tests/suites/failure/home/services/share/nimbus/acctdb-delete.sh
  A service/service/java/tests/suites/failure/home/services/share/nimbus/acctdb-reset.sh
  A service/service/java/tests/suites/failure/home/services/share/nimbus/full-delete.sh
  A service/service/java/tests/suites/failure/home/services/share/nimbus/full-reset.sh
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/db-mgmt.xml
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/notifications
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/pilotnotifications
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_accounting_dump.sql
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_accounting_schema.sql
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_dump.sql
  A service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  A service/service/java/tests/suites/failure/home/services/share/nimbus/servicedb-delete.sh
  A service/service/java/tests/suites/failure/home/services/share/nimbus/servicedb-reset.sh
  A service/service/java/tests/suites/failure/src/org/globus/workspace/testing/suites/failure/TerminateSuite.java
  A service/service/java/tests/suites/spotinstances/Issue26Suite.xml
  A service/service/java/tests/suites/spotinstances/NoResourcesSISuite.xml
  A service/service/java/tests/suites/spotinstances/SimpleSISuite.xml
  A service/service/java/tests/suites/spotinstances/SimplestSISuite.xml
  A service/service/java/tests/suites/spotinstances/SingleResourcePoolSISuite.xml
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/workspace-service/other/main.xml
  R service/service/java/tests/suites/spotinstances/home/var/run/privileged/.keep
  M service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/Issue26Suite.java
  M service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/SingleResourcePoolSISuite.java
  M tests/cc-1000-test.py
  M tests/cc-delete-test.sh
  M tests/cc-download-common-test.py
  M tests/cc-download-user-common-test.py
  M tests/cc-list-common-test.py
  M tests/cc-list-test.py
  M tests/cc-prop-test.py
  M tests/cc-prop2-test.py
  M tests/cc-propsamename-test.py
  M tests/cc-simple-network-test.py
  M tests/cc-simple-status-test.py
  M tests/cc-submit-common-save-exists-test.py
  M tests/cc-submit-common-save-submit-own.py
  M tests/cc-submit-common-test.py
  M tests/cc-submit-common-twice-test.py
  M tests/cc-submit-common-unprop-size-test.py
  M tests/cc-submit-test.py
  M tests/cc-unprop-md5test.py
  M tests/cc-unprop-readwrite-test.py
  M tests/cc-unprop-size-test.py
  M tests/cc-xfer-report-modified-test.py
  M tests/cc-xfer-report-readwrite-test.py
  M tests/cc-xfer-report-size-test.py
  M tests/cc-xfer-report-test.py
  M tests/cc-xfer-test.sh
  M tests/ec2_common_image_nose_tests.py
  M tests/ec2_repo_tests.py
  M tests/ec2_si_tests.py
  M tests/ec2_submit_tests.py
  M tests/make-test-env.sh
  A tests/nimbus-nodes.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: bccb7891a44ac0d9c15db37dfe2e0c10b6a024b3
      https://github.com/nimbusproject/nimbus/commit/bccb7891a44ac0d9c15db37dfe2e0c10b6a024b3
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-20 (Mon, 20 Jun 2011)

  Changed paths:
    M control/etc/workspace-control/libvirt.conf
  M control/etc/workspace-control/libvirt_template.xml
  M control/src/python/workspacecontrol/defaults/lvrt/lvrt_common.py
  M docs/src/admin/reference.html
  M docs/src/admin/z2c/vmm-setup.html
  M lantorrent/etc/lantorrent.inet.in
  M scripts/integration-suites.sh
  A service-api/java/source/src/org/nimbustools/api/services/rm/ImpossibleAmountOfMemoryException.java
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestManagerImpl.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapter.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterConstants.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterImpl.java
  M service/service/java/source/src/org/globus/workspace/scheduler/defaults/DefaultSlotManagement.java
  M service/service/java/source/src/org/globus/workspace/scheduler/defaults/ResourcepoolUtil.java
  M service/service/java/source/src/org/globus/workspace/service/WorkspaceHome.java
  M service/service/java/source/src/org/globus/workspace/service/impls/DestroyFutureTask.java
  M service/service/java/source/src/org/globus/workspace/service/impls/ResourceSweeper.java
  M service/service/java/source/src/org/globus/workspace/service/impls/WorkspaceHomeImpl.java
  M service/service/java/source/src/org/globus/workspace/xen/xenssh/MockShutdownTrash.java
  M service/service/java/tests/suites/build.properties
  M service/service/java/tests/suites/build.xml
  M service/service/java/tests/suites/common/src/org/globus/workspace/testing/NimbusTestBase.java
  A service/service/java/tests/suites/failure/BackoffSuite.xml
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/main.xml
  A service/service/java/tests/suites/failure/src/org/globus/workspace/testing/suites/failure/BackoffSuite.java
  M service/service/java/tests/suites/failure/src/org/globus/workspace/testing/suites/failure/TerminateSuite.java
  A service/service/java/tests/suites/spotinstances/BackfillTerminationSuite.xml
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/workspace-service/other/main.xml
  A service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/BackfillTerminationSuite.java
  A service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/DestroyEnableFutureTask.java
  M service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/Issue26Suite.java
  M service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/SimplestSISuite.java
  M service/service/java/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/SingleResourcePoolSISuite.java
  M tests/cc-1000-test.py
  M tests/cc-delete-test.sh
  M tests/cc-download-common-test.py
  M tests/cc-download-user-common-test.py
  M tests/cc-list-common-test.py
  M tests/cc-list-test.py
  M tests/cc-no-spinner-test.py
  M tests/cc-prop-test.py
  M tests/cc-prop2-test.py
  M tests/cc-propsamename-test.py
  M tests/cc-simple-network-test.py
  M tests/cc-simple-security-test.py
  M tests/cc-simple-status-test.py
  M tests/cc-submit-common-save-exists-test.py
  M tests/cc-submit-common-save-submit-own.py
  M tests/cc-submit-common-test.py
  M tests/cc-submit-common-twice-test.py
  M tests/cc-submit-common-unprop-size-test.py
  M tests/cc-submit-test.py
  M tests/cc-unprop-md5test.py
  M tests/cc-unprop-readwrite-test.py
  M tests/cc-unprop-size-test.py
  M tests/cc-xfer-report-modified-test.py
  M tests/cc-xfer-report-readwrite-test.py
  M tests/cc-xfer-report-size-test.py
  M tests/cc-xfer-report-test.py
  M tests/cc-xfer-test.sh
  M tests/ec2_common_image_nose_tests.py
  M tests/ec2_repo_tests.py
  M tests/ec2_si_tests.py
  M tests/ec2_submit_many.py
  M tests/ec2_submit_tests.py
  M tests/make-test-env.sh
  M tests/reset_tests.py
  M tests/user_failures_tests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: e96fe20ca6f2d940236f3d169cc9184e85b58a46
      https://github.com/nimbusproject/nimbus/commit/e96fe20ca6f2d940236f3d169cc9184e85b58a46
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M authzdb/src/org/nimbus/authz/AuthzDBAdapter.java
  M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminClient.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RMIConfig.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Addition of ability to shutdown vms added to nimbus-admin


  Commit: 945d86b6ad497528f518b3d3c0b7af51d1f3deb9
      https://github.com/nimbusproject/nimbus/commit/945d86b6ad497528f518b3d3c0b7af51d1f3deb9
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M service/service/java/source/etc/workspace-service/other/main.xml

  Log Message:
  -----------
  missed file


  Commit: 41489134f095afb2f2977a096f98d03bbcb348b0
      https://github.com/nimbusproject/nimbus/commit/41489134f095afb2f2977a096f98d03bbcb348b0
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-21 (Tue, 21 Jun 2011)

  Changed paths:
    M .idea-modules/ec2soap/ec2soap.iml
  M docs/src/admin/reference.html
  M docs/src/changelog.html
  M messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/main.xml
  M messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/other-elastic.conf
  A messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/ElasticPersistence.java
  A messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/defaults/DefaultElasticPersistence.java
  M messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultIDMgmt.java
  M messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultIDMgmtProxy.java
  R messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/IDMap.java
  R messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/ehcache.xml
  M messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/security/defaults/DefaultSSHKeys.java
  R messaging/gt4.0-elastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/security/defaults/KeyCacheProvider.java
  M messaging/query/java/source/etc/query/other/main.xml
  M scripts/integration-suites.sh
  M service/service/java/source/etc/workspace-service/other/main.xml
  M service/service/java/source/share/lib/db-mgmt.xml
  M service/service/java/source/share/lib/workspace_service_derby_schema.sql
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequest.java
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestMap.java
  M service/service/java/source/src/org/globus/workspace/persistence/DataConvert.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapter.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterConstants.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterImpl.java
  A service/service/java/source/src/org/globus/workspace/persistence/impls/AsyncRequestMapPersistenceUtil.java
  M service/service/java/source/src/org/globus/workspace/persistence/impls/VirtualMachinePersistenceUtil.java
  A service/service/java/tests/suites/basic/AsyncRequestMapSuite.xml
  M service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.xml
  M service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/other-elastic.conf
  M service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.xml
  M service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/main.xml
  M service/service/java/tests/suites/basic/home/services/share/nimbus/lib/db-mgmt.xml
  M service/service/java/tests/suites/basic/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  A service/service/java/tests/suites/basic/src/org/globus/workspace/testing/suites/basic/AsyncRequestMapSuite.java
  M service/service/java/tests/suites/build.properties
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/main.xml
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/other-elastic.conf
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/query/other/main.xml
  M service/service/java/tests/suites/failure/home/services/share/nimbus/lib/db-mgmt.xml
  M service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/elastic/other/main.xml
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/elastic/other/other-elastic.conf
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/query/other/main.xml
  M service/service/java/tests/suites/spotinstances/home/services/share/nimbus/lib/db-mgmt.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: c2cfc24584d6363d4305fe24883932fc390e520b
      https://github.com/nimbusproject/nimbus/commit/c2cfc24584d6363d4305fe24883932fc390e520b
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-22 (Wed, 22 Jun 2011)

  Changed paths:
    M docs/src/changelog.html
  M docs/src/index.html
  M service/service/java/source/share/lib/workspace_service_derby_schema.sql
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestStatus.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterConstants.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterImpl.java
  M service/service/java/source/src/org/globus/workspace/persistence/impls/AsyncRequestMapPersistenceUtil.java
  M service/service/java/tests/suites/basic/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/basic/src/org/globus/workspace/testing/suites/basic/AsyncRequestMapSuite.java
  M service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/workspace-service/other/main.xml
  M service/service/java/tests/suites/spotinstances/home/services/share/nimbus/lib/workspace_service_derby_schema.sql

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 607bfe286a9fdcf1cb25467585001778d6feca33
      https://github.com/nimbusproject/nimbus/commit/607bfe286a9fdcf1cb25467585001778d6feca33
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-22 (Wed, 22 Jun 2011)

  Changed paths:
    M docs/src/admin/index.html
  M docs/src/admin/quickstart.html
  M docs/src/admin/reference.html
  M docs/src/admin/troubleshooting.html
  M docs/src/admin/upgrading.html
  M docs/src/admin/walkthrough.html
  M docs/src/admin/z2c/final-tests.html
  M docs/src/admin/z2c/index.html
  M docs/src/admin/z2c/networking-setup.html
  M docs/src/admin/z2c/service-dependencies.html
  M docs/src/admin/z2c/service-setup.html
  M docs/src/admin/z2c/ssh-setup.html
  M docs/src/admin/z2c/vmm-kvm-notes.html
  M docs/src/admin/z2c/vmm-setup.html
  M docs/src/admin/z2c/vmm-xen-notes.html
  M docs/src/dev/apis.html
  M docs/src/dev/docs.html
  M docs/src/dev/index.html
  M docs/src/dev/meta.html
  M docs/src/dev/reference.html
  M docs/src/dev/sccs.html
  M docs/src/dev/testing.html
  M docs/src/index.html
  M docs/src/platform/cloudinitd/index.html
  M docs/src/plugins/index.html
  M docs/src/plugins/service-accounting.html
  M docs/src/plugins/service-authz.html
  M docs/src/plugins/service-network.html
  M docs/src/plugins/service-prop.html
  M docs/src/plugins/service-reqintake.html
  M docs/src/plugins/service-sched.html
  M docs/src/plugins/service-tasks.html
  M docs/src/summary.html
  M scripts/lib/gt4.0/dist/build.properties
  M service/service/java/source/share/lib/workspace_service_derby_schema.sql
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequest.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterConstants.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterImpl.java
  M service/service/java/source/src/org/globus/workspace/persistence/impls/AsyncRequestMapPersistenceUtil.java
  M service/service/java/tests/suites/basic/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/basic/src/org/globus/workspace/testing/suites/basic/AsyncRequestMapSuite.java
  M service/service/java/tests/suites/spotinstances/home/services/share/nimbus/lib/workspace_service_derby_schema.sql

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 4749c9b8786ef8caafba6ac833e90d68a0564673
      https://github.com/nimbusproject/nimbus/commit/4749c9b8786ef8caafba6ac833e90d68a0564673
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-22 (Wed, 22 Jun 2011)

  Changed paths:
    M docs/src/admin/z2c/vmm-setup.html
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: ec6bb5971dd28c02269fd8ef056a905c9a0b156e
      https://github.com/nimbusproject/nimbus/commit/ec6bb5971dd28c02269fd8ef056a905c9a0b156e
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/VMTranslation.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminClient.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminEnum.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RMIConfig.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java
  M tests/cc-nimbusAdmin-test.py

  Log Message:
  -----------
  Working nimbus-admin for --list and --shutdown, reports integrated and working


  Commit: 173a2b07007f85e15d51dc191f278a80ef538634
      https://github.com/nimbusproject/nimbus/commit/173a2b07007f85e15d51dc191f278a80ef538634
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M .gitignore
  M .idea-modules/ctx/contextualization.iml
  A .idea-modules/query-general/query-general.iml
  M .idea-modules/query/ec2query.iml
  M .idea-modules/service-suites/tests-common.iml
  M .idea-modules/wrksp-svc/workspace-service.iml
  R .idea/libraries/ctxbroker_libs.xml
  R .idea/libraries/workspace_service_libs.xml
  M .idea/modules.xml
  M authzdb/build.xml
  M control/etc/workspace-control/images.conf
  M ctx-broker/build.properties
  M ctx-broker/build.xml
  M ctx-broker/gar/build.properties
  M ctx-broker/gar/build.xml
  A ctx-broker/gar/etc/other/bundled-main.conflocator.xml
  A ctx-broker/gar/etc/other/bundled-main.xml
  R ctx-broker/gar/etc/other/main.conflocator.xml
  R ctx-broker/gar/etc/other/main.xml
  A ctx-broker/gar/etc/other/standalone-main.xml
  A ctx-broker/gar/etc/user-mapfile
  A ctx-broker/home/bin/broker-configure
  A ctx-broker/home/bin/brokerctl
  A ctx-broker/home/lib/ProcessManager.py
  A ctx-broker/home/lib/brokerctl.py
  A ctx-broker/home/lib/pynimbusconfig/README
  A ctx-broker/home/lib/pynimbusconfig/__init__.py
  A ctx-broker/home/lib/pynimbusconfig/autoca.py
  A ctx-broker/home/lib/pynimbusconfig/broker/__init__.py
  A ctx-broker/home/lib/pynimbusconfig/broker/main.py
  A ctx-broker/home/lib/pynimbusconfig/checkssl.py
  A ctx-broker/home/lib/pynimbusconfig/ezpz_ca.py
  A ctx-broker/home/lib/pynimbusconfig/forcessl.py
  A ctx-broker/home/lib/pynimbusconfig/gtcontainer.py
  A ctx-broker/home/lib/pynimbusconfig/iaas/__init__.py
  A ctx-broker/home/lib/pynimbusconfig/iaas/derbyutil.py
  A ctx-broker/home/lib/pynimbusconfig/iaas/groupauthz.py
  A ctx-broker/home/lib/pynimbusconfig/iaas/main.py
  A ctx-broker/home/lib/pynimbusconfig/javautil.py
  A ctx-broker/home/lib/pynimbusconfig/pathutil.py
  A ctx-broker/home/lib/pynimbusconfig/runutil.py
  A ctx-broker/home/lib/pynimbusconfig/setuperrors.py
  A ctx-broker/home/lib/pynimbusconfig/test/__init__.py
  A ctx-broker/home/lib/pynimbusconfig/test/test_groupauthz.py
  A ctx-broker/home/lib/pynimbusconfig/web/__init__.py
  A ctx-broker/home/lib/pynimbusconfig/web/newconf.py
  A ctx-broker/home/lib/run-broker.sh
  A ctx-broker/home/lib/run-pynimbusconfig-tests.sh
  M ctx-broker/src/org/nimbustools/ctxbroker/rest/BrokerResource.java
  M ctx-broker/src/org/nimbustools/ctxbroker/rest/ContextStatus.java
  M ctx-broker/src/org/nimbustools/ctxbroker/rest/RestHttp.java
  M ctx-broker/wsdl/stubs/build.xml
  M docs/src/changelog.html
  M home/libexec/nimbus_import_users.py
  R lib/services/commons-dbcp.jar
  R lib/services/commons-io-1.4.jar
  R lib/services/commons-pool.jar
  R lib/services/derby.jar
  R lib/services/derbyclient.jar
  R lib/services/derbynet.jar
  R lib/services/derbyrun.jar
  R lib/services/derbytools.jar
  R lib/services/junixsocket-1.3.jar
  R lib/services/junixsocket-rmi-1.3.jar
  R lib/services/sqlitejdbc-v056.jar
  A lib/workspaceservice/commons-dbcp.jar
  A lib/workspaceservice/commons-io-1.4.jar
  A lib/workspaceservice/commons-pool.jar
  A lib/workspaceservice/derby.jar
  A lib/workspaceservice/derbyclient.jar
  A lib/workspaceservice/derbynet.jar
  A lib/workspaceservice/derbyrun.jar
  A lib/workspaceservice/derbytools.jar
  A lib/workspaceservice/junixsocket-1.3.jar
  A lib/workspaceservice/junixsocket-rmi-1.3.jar
  A lib/workspaceservice/sqlitejdbc-v056.jar
  M messaging/gt4.0-elastic/java/msgbridge/build.properties
  M messaging/gt4.0-elastic/java/msgbridge/build.xml
  M messaging/gt4.0/java/common/build.properties
  M messaging/gt4.0/java/common/build.xml
  M messaging/gt4.0/java/gar-builder/build.properties
  M messaging/gt4.0/java/gar-builder/build.xml
  M messaging/query/java/source/build.properties
  M messaging/query/java/source/build.xml
  R messaging/query/java/source/src/org/nimbustools/messaging/query/security/FileUserDetailsService.java
  M messaging/query/java/source/src/org/nimbustools/messaging/query/security/NimbusAuthzUserDetailsService.java
  M messaging/query/java/source/src/org/nimbustools/messaging/query/security/QueryAuthenticationFilter.java
  M messaging/query/java/source/src/org/nimbustools/messaging/query/security/QueryAuthenticationToken.java
  M messaging/query/java/source/src/org/nimbustools/messaging/query/security/QueryContainerInterface.java
  R messaging/query/java/source/src/org/nimbustools/messaging/query/security/QueryUser.java
  R messaging/query/java/source/src/org/nimbustools/messaging/query/security/QueryUserDetailsService.java
  M metadata/java/source/build.properties
  M metadata/java/source/build.xml
  A query/build.properties
  A query/build.xml
  A query/src/org/nimbustools/querygeneral/security/FileUserDetailsService.java
  A query/src/org/nimbustools/querygeneral/security/QueryUser.java
  A query/src/org/nimbustools/querygeneral/security/QueryUserDetailsService.java
  A scripts/broker-make-dist.sh
  M scripts/gt/broker-build-and-install.sh
  A scripts/install-broker-only
  M scripts/integration-suites.sh
  A scripts/lib/gt4.0/brokerdist/build.properties
  A scripts/lib/gt4.0/brokerdist/build.xml
  A scripts/lib/gt4.0/brokerdist/topdocs/LICENSE.txt
  A scripts/lib/gt4.0/brokerdist/topdocs/README.txt
  M scripts/lib/gt4.0/build/build.properties
  M scripts/lib/gt4.0/build/build.xml
  M scripts/lib/gt4.0/dist/build.properties
  M scripts/lib/gt4.0/dist/build.xml
  M scripts/make-dist.sh
  M service/service/java/source/build.properties
  M service/service/java/source/build.xml
  M service/service/java/source/etc/workspace-service/group-authz/README.txt
  M service/service/java/source/etc/workspace-service/group-authz/group01.properties
  M service/service/java/source/etc/workspace-service/group-authz/group02.properties
  M service/service/java/source/etc/workspace-service/group-authz/group03.properties
  M service/service/java/source/etc/workspace-service/group-authz/group04.properties
  M service/service/java/source/src/org/globus/workspace/async/AsyncRequestManagerImpl.java
  M service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterImpl.java
  M service/service/java/source/src/org/globus/workspace/persistence/impls/AsyncRequestMapPersistenceUtil.java
  M service/service/java/tests/suites/basic/src/org/globus/workspace/testing/suites/basic/AsyncRequestMapSuite.java
  M service/service/java/tests/suites/build.properties
  M service/service/java/tests/suites/build.xml
  M service/service/java/tests/suites/common/src/org/globus/workspace/testing/NimbusTestBase.java
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/main.xml
  M service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/failure/src/org/globus/workspace/testing/suites/failure/TerminateSuite.java
  M tests/make-test-env.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: a1e78047b085d24e2c56be155b91d8735d36e46a
      https://github.com/nimbusproject/nimbus/commit/a1e78047b085d24e2c56be155b91d8735d36e46a
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M .idea-modules/ec2soap/ec2soap.iml
  M .idea-modules/query/ec2query.iml
  M .idea-modules/wrksp-svc/workspace-service.iml
  M .idea/misc.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 99b52f00bd35c63edbfd0661e94aa3ddfb01b959
      https://github.com/nimbusproject/nimbus/commit/99b52f00bd35c63edbfd0661e94aa3ddfb01b959
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M home/libexec/nimbus_version.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 7bbca6080608e383bc53a8b0687b2a1451973bbb
      https://github.com/nimbusproject/nimbus/commit/7bbca6080608e383bc53a8b0687b2a1451973bbb
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    A .idea/libraries/ctxbroker_libs.xml
  A .idea/libraries/lib_services.xml
  A .idea/libraries/lib_workspaceservice.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 0fa54b7bb785f6028094df91672d5edb173df0fd
      https://github.com/nimbusproject/nimbus/commit/0fa54b7bb785f6028094df91672d5edb173df0fd
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-24 (Fri, 24 Jun 2011)

  Changed paths:
    M scripts/lib/web_ball.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: f97ba03621439db475853638b4bd031680990f9d
      https://github.com/nimbusproject/nimbus/commit/f97ba03621439db475853638b4bd031680990f9d
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/etc/workspace-service/other/main.xml
  M service/service/java/source/src/org/globus/workspace/remoting/admin/VMTranslation.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  A service/service/java/source/src/org/globus/workspace/remoting/admin/client/adminHelp.txt
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Added more options for shutdown and list.
Added Help file for nimbus-admin


  Commit: 85254b3d5d5d95df13bfff72a9bac030673d71c7
      https://github.com/nimbusproject/nimbus/commit/85254b3d5d5d95df13bfff72a9bac030673d71c7
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-28 (Tue, 28 Jun 2011)

  Changed paths:
    M scripts/lib/gt4.0/brokerdist/build.xml
  M service/service/java/source/share/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/basic/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/other/common.conf
  M service/service/java/tests/suites/failure/home/services/share/nimbus/lib/workspace_service_derby_schema.sql
  M service/service/java/tests/suites/failure/src/org/globus/workspace/testing/suites/failure/TerminateSuite.java
  M service/service/java/tests/suites/spotinstances/home/services/share/nimbus/lib/workspace_service_derby_schema.sql

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 15223d2d65891bf898b34ad300b058d41bd01bea
      https://github.com/nimbusproject/nimbus/commit/15223d2d65891bf898b34ad300b058d41bd01bea
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-06-29 (Wed, 29 Jun 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/VMTranslation.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminEnum.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Added some documentation


  Commit: 50f3da1413e3b7f34510829524b8d5fda281d05a
      https://github.com/nimbusproject/nimbus/commit/50f3da1413e3b7f34510829524b8d5fda281d05a
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-04 (Mon, 04 Jul 2011)

  Changed paths:
    M .idea/misc.xml
  M cloud-client/builder/environment.sh
  M cloud-client/nimbus-cloud-client-src/CHANGES.txt
  M cloud-client/nimbus-cloud-client-src/samples/base-cluster.xml
  M cumulus/cb/pycb/cbPosixBackend.py
  M service/client/java/source/src/org/globus/workspace/cloud/client/util/CumulusTask.java
  M service/client/java/source/src/org/globus/workspace/cloud/meta/client/CloudManager.java
  A tests/cc-submit-dash-common-test.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 6e85f003671be2e0155d101679e9f8076c224a9b
      https://github.com/nimbusproject/nimbus/commit/6e85f003671be2e0155d101679e9f8076c224a9b
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-06 (Wed, 06 Jul 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/etc/workspace-service/other/main.xml
  M service/service/java/source/src/org/globus/workspace/groupauthz/Group.java
  M service/service/java/source/src/org/globus/workspace/groupauthz/GroupAuthz.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/VMTranslation.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/adminHelp.txt
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Added ability to list by group id and group name.
Added group id and group name to list output


  Commit: 15a14b5585e6c2cfe130438410bb91bcdb2365a5
      https://github.com/nimbusproject/nimbus/commit/15a14b5585e6c2cfe130438410bb91bcdb2365a5
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-12 (Tue, 12 Jul 2011)

  Changed paths:
    M cumulus/cb/pycb/cbRequest.py
  M cumulus/cb/pycb/cumulus.py
  M lantorrent/README.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 5c6717689916ee01befd10f1bd66e1eab7ee1d98
      https://github.com/nimbusproject/nimbus/commit/5c6717689916ee01befd10f1bd66e1eab7ee1d98
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-12 (Tue, 12 Jul 2011)

  Changed paths:
    M cumulus/cb/docs/README.txt
  M cumulus/conf/README
  M cumulus/docs/FAQ.txt
  M cumulus/docs/README.txt
  M docs/src/changelog.html
  M scripts/lib/gt4.0/dist/build.properties

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: e7a625f2229d9dde51b08a228de2a8c6c80a2760
      https://github.com/nimbusproject/nimbus/commit/e7a625f2229d9dde51b08a228de2a8c6c80a2760
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-12 (Tue, 12 Jul 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/VMTranslation.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/adminHelp.txt
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Added ability to shut down VMs by user_name, DN, group id and group name
Also rearranged code in DefaultRemoteAdminToolsMgmt


  Commit: 17574610c223a99c9c96824a541e296b20711d35
      https://github.com/nimbusproject/nimbus/commit/17574610c223a99c9c96824a541e296b20711d35
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-14 (Thu, 14 Jul 2011)

  Changed paths:
    M ctx-broker/gar/etc/user-mapfile
  M docs/src/changelog.html
  M home/libexec/nimbus_edit_user.py
  M home/libexec/nimbus_new_user.py
  M home/libexec/nimbus_remove_user.py
  M lantorrent/pylantorrent/client.py
  M scripts/lib/gt4.0/brokerdist/build.properties
  M scripts/make-dist.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 0bc88bcbfde3060201762a874e567af6e565983b
      https://github.com/nimbusproject/nimbus/commit/0bc88bcbfde3060201762a874e567af6e565983b
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-14 (Thu, 14 Jul 2011)

  Changed paths:
    M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/adminHelp.txt
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Added ability to shut down list of VMs for all options
Changed error output handling


  Commit: bd5e532ea343f17d290aa996dbcc9ecfe28c1bed
      https://github.com/nimbusproject/nimbus/commit/bd5e532ea343f17d290aa996dbcc9ecfe28c1bed
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-18 (Mon, 18 Jul 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteNodeManagement.java
  M service/service/java/source/etc/workspace-service/other/main.xml
  M service/service/java/source/src/org/globus/workspace/network/AssociationEntry.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminClient.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/help.txt
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteNodeManagement.java
  R service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/FakeRemoteNodeManagement.java

  Log Message:
  -----------
  Added --allocation option to nimbus-nodes which lists network pool information


  Commit: ef2e8c6532b8d4ed176d1e99031e5a9ed8088621
      https://github.com/nimbusproject/nimbus/commit/ef2e8c6532b8d4ed176d1e99031e5a9ed8088621
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-19 (Tue, 19 Jul 2011)

  Changed paths:
    M docs/src/changelog.html

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: a0e24245f5c58c146c69f76f34e01c058a771d2e
      https://github.com/nimbusproject/nimbus/commit/a0e24245f5c58c146c69f76f34e01c058a771d2e
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-19 (Tue, 19 Jul 2011)

  Changed paths:
    M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java
  A tests/cc-nimbusAdminList-test.py
  A tests/cc-nimbusAdminShutdown-test.py
  A tests/cc-nimbusNodesAlloc-test.py

  Log Message:
  -----------
  Added 3 b&t tests for nimbus-admin and nimbus-nodes
Fixed bug in nimbus-admin


  Commit: 4720d0f67b191d8bd36e83bde43d5e5432638989
      https://github.com/nimbusproject/nimbus/commit/4720d0f67b191d8bd36e83bde43d5e5432638989
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-19 (Tue, 19 Jul 2011)

  Changed paths:
    M service/service/java/source/src/org/globus/workspace/remoting/admin/VmmNode.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminClient.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteNodeManagement.java

  Log Message:
  -----------
  Added available memory to VMM node output


  Commit: aaba40fb8a2c37107441c733e44b39aac311109d
      https://github.com/nimbusproject/nimbus/commit/aaba40fb8a2c37107441c733e44b39aac311109d
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-20 (Wed, 20 Jul 2011)

  Changed paths:
    M service/service/java/source/etc/workspace-service/global-policies.conf
  M service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/global-policies.conf
  M service/service/java/tests/suites/failure/home/services/etc/nimbus/workspace-service/global-policies.conf
  M service/service/java/tests/suites/spotinstances/home/services/etc/nimbus/workspace-service/global-policies.conf

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: a713efe1622523f57999a73cc45f2c4d212297b3
      https://github.com/nimbusproject/nimbus/commit/a713efe1622523f57999a73cc45f2c4d212297b3
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-20 (Wed, 20 Jul 2011)

  Changed paths:
    M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/AdminClient.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RMIConfig.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java
  M tests/cc-nimbusAdminList-test.py

  Log Message:
  -----------
  Added --nodes to nimbusAdmin which shows which vm ids are running on which nodes
moved helpconfig to RMIConfig


  Commit: aa71cdc1f8490a716b6f4bf54a78483b42dc5bfc
      https://github.com/nimbusproject/nimbus/commit/aa71cdc1f8490a716b6f4bf54a78483b42dc5bfc
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-20 (Wed, 20 Jul 2011)

  Changed paths:
    M service/service/java/source/src/org/globus/workspace/remoting/admin/client/adminHelp.txt

  Log Message:
  -----------
  updated help file


  Commit: fa4a13e703754d795ca65a21918b16495fbce91d
      https://github.com/nimbusproject/nimbus/commit/fa4a13e703754d795ca65a21918b16495fbce91d
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-26 (Tue, 26 Jul 2011)

  Changed paths:
    M docs/src/admin/reference.html
  M service-api/java/source/src/org/nimbustools/api/services/admin/RemoteAdminToolsManagement.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/Opts.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/RemoteAdminToolsMain.java
  M service/service/java/source/src/org/globus/workspace/remoting/admin/client/adminHelp.txt
  M service/service/java/source/src/org/globus/workspace/remoting/admin/defaults/DefaultRemoteAdminToolsMgmt.java

  Log Message:
  -----------
  Added --state option to nimbus-admin
Created documentation for nimbus-admin and nimbus-nodes in reference.html


  Commit: 2dc615a385b4b0cda282bc4360c00b0ca7b6712d
      https://github.com/nimbusproject/nimbus/commit/2dc615a385b4b0cda282bc4360c00b0ca7b6712d
  Author: Rob <rrusnak at uvic.ca>
  Date:   2011-07-26 (Tue, 26 Jul 2011)

  Changed paths:
    M docs/src/admin/reference.html

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


Compare: https://github.com/nimbusproject/nimbus/compare/b525912^...2dc615a



More information about the workspace-commit mailing list