arvados.git
8 years ago6967: More helpful comment & assertion failure message 6967-yaml-format
Tom Clegg [Thu, 8 Oct 2015 18:46:22 +0000 (14:46 -0400)]
6967: More helpful comment & assertion failure message

8 years ago6967: Use git status --porcelain to isolate from user config
Tom Clegg [Thu, 8 Oct 2015 18:45:33 +0000 (14:45 -0400)]
6967: Use git status --porcelain to isolate from user config

8 years ago6967: Move source_version detection code from config yaml to lib/app_version.rb.
Tom Clegg [Wed, 7 Oct 2015 15:11:14 +0000 (11:11 -0400)]
6967: Move source_version detection code from config yaml to lib/app_version.rb.

8 years ago6967: Move source_version detection code from config yaml to lib/app_version.rb.
Tom Clegg [Wed, 7 Oct 2015 14:00:16 +0000 (10:00 -0400)]
6967: Move source_version detection code from config yaml to lib/app_version.rb.

8 years ago6967: Treat blob_signing_key like a secret in `rake config:check`.
Tom Clegg [Wed, 7 Oct 2015 14:01:22 +0000 (10:01 -0400)]
6967: Treat blob_signing_key like a secret in `rake config:check`.

8 years agoMerge branch '7435-node-manager-shutdown-cleanup-wip'
Brett Smith [Wed, 7 Oct 2015 14:54:08 +0000 (10:54 -0400)]
Merge branch '7435-node-manager-shutdown-cleanup-wip'

Closes #7435, #7445.

8 years ago7435: Node Manager stops trying to shut down delisted cloud nodes.
Brett Smith [Fri, 2 Oct 2015 15:07:27 +0000 (11:07 -0400)]
7435: Node Manager stops trying to shut down delisted cloud nodes.

If the underlying node is gone, trying to destroy it in the cloud will
almost certainly fail.  It's hard to predict what will happen to
related actions like draining the node in SLURM.  Just cancel the
attempt, and trust other systems like SLURM and Crunch to deal with
the disappearance on their own.

8 years agoMerge branch '7286-nodeman-destroy-broken-nodes' closes #7286
Peter Amstutz [Tue, 6 Oct 2015 13:17:30 +0000 (09:17 -0400)]
Merge branch '7286-nodeman-destroy-broken-nodes' closes #7286

8 years ago7286: Add comments clarifying arvados_node_missing() and broken(). Also bump
Peter Amstutz [Tue, 6 Oct 2015 01:33:00 +0000 (21:33 -0400)]
7286: Add comments clarifying arvados_node_missing() and broken().  Also bump
up version dependency to dev4.

8 years ago7214: Fix "X-Keep-Replicas-Stored: 0" header when block is already present. refs...
Tom Clegg [Fri, 2 Oct 2015 22:09:39 +0000 (18:09 -0400)]
7214: Fix "X-Keep-Replicas-Stored: 0" header when block is already present. refs #7214

8 years agoMerge branch '7241-azure-blob-volume' closes #7241
Tom Clegg [Fri, 2 Oct 2015 20:06:12 +0000 (16:06 -0400)]
Merge branch '7241-azure-blob-volume' closes #7241

8 years ago7286: Add BaseHTTPError to list of "cloud errors"
Peter Amstutz [Thu, 1 Oct 2015 17:00:00 +0000 (13:00 -0400)]
7286: Add BaseHTTPError to list of "cloud errors"

8 years ago7286: Add drain* and fail* to SLURM_END_STATES, because the '*' means the node
Peter Amstutz [Thu, 1 Oct 2015 13:32:33 +0000 (09:32 -0400)]
7286: Add drain* and fail* to SLURM_END_STATES, because the '*' means the node
is out of contact with slurm.

8 years ago7286: Fix double count of missing nodes in shutdown
Peter Amstutz [Wed, 30 Sep 2015 21:16:09 +0000 (17:16 -0400)]
7286: Fix double count of missing nodes in shutdown

8 years ago7286: Missing nodes are considered in "excess" count (reverts previous change). ...
Peter Amstutz [Wed, 30 Sep 2015 20:26:46 +0000 (16:26 -0400)]
7286: Missing nodes are considered in "excess" count (reverts previous change).  Added test.  Also remove debug log statement.

8 years ago7286: Compute "missing" based on "last_ping_at" instead of using API server's
Peter Amstutz [Wed, 30 Sep 2015 18:23:25 +0000 (14:23 -0400)]
7286: Compute "missing" based on "last_ping_at" instead of using API server's
buggy "status" field.

8 years agocloses #7200
radhika [Wed, 30 Sep 2015 15:53:20 +0000 (11:53 -0400)]
closes #7200
Merge branch '7200-keepproxy-index-api'

8 years ago7200: more compact CheckAuthorizationHeader block
radhika [Wed, 30 Sep 2015 15:46:41 +0000 (11:46 -0400)]
7200: more compact CheckAuthorizationHeader block

8 years ago7200: Use io.Copy instead of reading all bytes and writing to response. Much improved...
radhika [Wed, 30 Sep 2015 15:28:36 +0000 (11:28 -0400)]
7200: Use io.Copy instead of reading all bytes and writing to response. Much improved keep proxy test with code reuse.

8 years ago7286: Add test that "missing" nodes are not counted towards "busy" (but are
Peter Amstutz [Wed, 30 Sep 2015 14:35:04 +0000 (10:35 -0400)]
7286: Add test that "missing" nodes are not counted towards "busy" (but are
counted towards node max).

8 years ago7207: Remove `arv keep check` and `arv keep less`.
Brett Smith [Wed, 30 Sep 2015 14:18:18 +0000 (10:18 -0400)]
7207: Remove `arv keep check` and `arv keep less`.

The implementations are no longer maintained and these are stale
references.  Closes #7207.

8 years ago7263: crunch-job checks for refreshes every two seconds.
Brett Smith [Wed, 30 Sep 2015 13:10:27 +0000 (09:10 -0400)]
7263: crunch-job checks for refreshes every two seconds.

This avoids the possibility that a constant stream of data from tasks
can prevent the job from being canceled.  Refs #7263.

8 years ago7200: no need to set content length header in keepproxy IndexHandler since the respon...
radhika [Wed, 30 Sep 2015 02:19:42 +0000 (22:19 -0400)]
7200: no need to set content length header in keepproxy IndexHandler since the response is always terminated by a blank new line.

8 years ago7200: Use if statement instead of switch to check http method in keepclient; strip...
radhika [Wed, 30 Sep 2015 00:31:00 +0000 (20:31 -0400)]
7200: Use if statement instead of switch to check http method in keepclient; strip terminating empty line from response in keepclient.
Update tests accordingly. Also, improve keepproxy test to verify that "other" locators are included when no prefix is used in GetIndex requests.

8 years agoMerge branch 'master' into 7200-keepproxy-index-api
radhika [Tue, 29 Sep 2015 21:44:26 +0000 (17:44 -0400)]
Merge branch 'master' into 7200-keepproxy-index-api

8 years ago7286: Tests for new "missing and broken" shutdown policy.
Peter Amstutz [Tue, 29 Sep 2015 20:43:41 +0000 (16:43 -0400)]
7286: Tests for new "missing and broken" shutdown policy.

8 years agoMerge branch 'master' into 7241-azure-blob-volume
Tom Clegg [Tue, 29 Sep 2015 18:22:22 +0000 (14:22 -0400)]
Merge branch 'master' into 7241-azure-blob-volume

Conflicts:
services/keepstore/volume_generic_test.go
services/keepstore/handlers_with_generic_volume_test.go

8 years ago7241: Use If-Match header to address Delete/Put races.
Tom Clegg [Tue, 29 Sep 2015 18:19:40 +0000 (14:19 -0400)]
7241: Use If-Match header to address Delete/Put races.

8 years agoMerge branch '7330-improved-sso-package'
Ward Vandewege [Tue, 29 Sep 2015 18:03:52 +0000 (14:03 -0400)]
Merge branch '7330-improved-sso-package'

closes #7330

8 years agoMerge branch 'master' into 7330-improved-sso-package
Ward Vandewege [Tue, 29 Sep 2015 17:50:44 +0000 (13:50 -0400)]
Merge branch 'master' into 7330-improved-sso-package

refs #7330

8 years agoMore language tweaks.
Ward Vandewege [Tue, 29 Sep 2015 17:48:19 +0000 (13:48 -0400)]
More language tweaks.

refs #7330

8 years agorefs #6859
radhika [Tue, 29 Sep 2015 16:13:04 +0000 (12:13 -0400)]
refs #6859
Added include statement to the script.

8 years ago7330: 'edit' should be replaced by 'editor' that will go to the default editor of...
Nico Cesar [Tue, 29 Sep 2015 14:28:05 +0000 (10:28 -0400)]
7330: 'edit' should be replaced by 'editor' that will go to the default editor of the ditro

refs #7330

8 years ago7286: Move logic to shut down newly booted nodes nodes that haven't pinged to
Peter Amstutz [Tue, 29 Sep 2015 14:27:10 +0000 (10:27 -0400)]
7286: Move logic to shut down newly booted nodes nodes that haven't pinged to
ComputeNodeMonitorActor.  Shut down nodes if they have "missing" status and are
"broken" according to the cloud client.  Don't count "missing" nodes as "up"
when deciding whether to boot more nodes.

8 years ago7330: making sso install guide similar to workbench and api server
Nico Cesar [Tue, 29 Sep 2015 13:46:50 +0000 (09:46 -0400)]
7330: making sso install guide similar to workbench and api server

refs #7330

8 years ago7330: apt-get command had a typo
Nico Cesar [Tue, 29 Sep 2015 13:28:21 +0000 (09:28 -0400)]
7330: apt-get command had a typo

refs #7330

8 years ago7330: curl isnt available by default in ubuntu 14.04. added the apt-get
Nico Cesar [Tue, 29 Sep 2015 13:02:06 +0000 (09:02 -0400)]
7330: curl isnt available by default in ubuntu 14.04. added the apt-get

refs #7330

8 years agoAnother tweak for the SSO server installation guide: the PostgreSQL
Ward Vandewege [Tue, 29 Sep 2015 00:17:12 +0000 (20:17 -0400)]
Another tweak for the SSO server installation guide: the PostgreSQL
service needs to be started manually if it was pulled in as a dependency
by arvados-sso-server.

refs #7330

8 years agoMore improvements for the SSO server installation guide.
Ward Vandewege [Tue, 29 Sep 2015 00:09:00 +0000 (20:09 -0400)]
More improvements for the SSO server installation guide.

refs #7330

8 years agoUpdate the SSO installation documentation to reflect the new and
Ward Vandewege [Mon, 28 Sep 2015 21:02:48 +0000 (17:02 -0400)]
Update the SSO installation documentation to reflect the new and
improved packages.

refs #7330

8 years agoMerge branch 'master' into 7200-keepproxy-index-api
radhika [Mon, 28 Sep 2015 19:56:32 +0000 (15:56 -0400)]
Merge branch 'master' into 7200-keepproxy-index-api

8 years ago7200: rename error variables to meet golint suggestions.
radhika [Mon, 28 Sep 2015 19:55:43 +0000 (15:55 -0400)]
7200: rename error variables to meet golint suggestions.

8 years ago7200: The incomplete response when no such prefix exists will be "\n". Update keepcli...
radhika [Mon, 28 Sep 2015 19:28:24 +0000 (15:28 -0400)]
7200: The incomplete response when no such prefix exists will be "\n". Update keepclient and keepproxy to expect this.
Also, added some more comments and golint checks for the newly added code.

8 years ago6034: added scafolding of the first initscript
Nico Cesar [Mon, 28 Sep 2015 18:54:33 +0000 (14:54 -0400)]
6034: added scafolding of the first initscript

refs #6034

8 years ago7241: Use new CreateBlockBlobFromReader and SetBlobMetadata APIs for Put and Touch.
Tom Clegg [Mon, 28 Sep 2015 18:41:24 +0000 (14:41 -0400)]
7241: Use new CreateBlockBlobFromReader and SetBlobMetadata APIs for Put and Touch.

8 years agoRuby 2.1.7 is out, update documentation accordingly.
Ward Vandewege [Mon, 28 Sep 2015 14:29:56 +0000 (10:29 -0400)]
Ruby 2.1.7 is out, update documentation accordingly.

No issue #

8 years ago7200: add GetIndex function to keepclient; add IndexHandler to keepproxy.
radhika [Mon, 28 Sep 2015 14:10:48 +0000 (10:10 -0400)]
7200: add GetIndex function to keepclient; add IndexHandler to keepproxy.

8 years agoMerge branch 'pr/29'
Brett Smith [Mon, 28 Sep 2015 13:53:20 +0000 (09:53 -0400)]
Merge branch 'pr/29'

Closes #7388.

8 years agoChange ssh public key to 700 after key-sync
LunarShaddow [Mon, 28 Sep 2015 02:48:03 +0000 (10:48 +0800)]
Change ssh public key to 700 after key-sync

8 years ago7241: Do not bother trying to add a volume if credential args are missing/empty.
Tom Clegg [Fri, 25 Sep 2015 19:31:27 +0000 (15:31 -0400)]
7241: Do not bother trying to add a volume if credential args are missing/empty.

8 years ago7241: Add -azure-storage-replication flag.
Tom Clegg [Fri, 25 Sep 2015 18:56:27 +0000 (14:56 -0400)]
7241: Add -azure-storage-replication flag.

8 years ago7241: Stub Azure API calls
Tom Clegg [Thu, 24 Sep 2015 22:31:43 +0000 (18:31 -0400)]
7241: Stub Azure API calls

8 years agocloses #7161
radhika [Fri, 25 Sep 2015 17:27:24 +0000 (13:27 -0400)]
closes #7161
Merge branch '7161-support-all-service-types'

8 years agoMerge branch '7161-support-all-service-types' of git.curoverse.com:arvados into 7161...
radhika [Fri, 25 Sep 2015 16:44:15 +0000 (12:44 -0400)]
Merge branch '7161-support-all-service-types' of git.curoverse.com:arvados into 7161-support-all-service-types

8 years ago7161: Use default value of 1 for max_replicas_per_service and set it to None when...
radhika [Fri, 25 Sep 2015 14:13:49 +0000 (10:13 -0400)]
7161: Use default value of 1 for max_replicas_per_service and set it to None when writable non-disk type services are found.

8 years ago7161: white space
radhika [Thu, 24 Sep 2015 18:57:40 +0000 (14:57 -0400)]
7161: white space

8 years ago7161: clarify max_replicas_per_service
radhika [Thu, 24 Sep 2015 18:52:39 +0000 (14:52 -0400)]
7161: clarify max_replicas_per_service

8 years ago7161: Look for all service hints, not just keep proxy. Also, use thread count of...
radhika [Wed, 23 Sep 2015 19:32:44 +0000 (15:32 -0400)]
7161: Look for all service hints, not just keep proxy. Also, use thread count of 1 when it not a disk.

8 years agocloses #7162
radhika [Fri, 25 Sep 2015 16:15:36 +0000 (12:15 -0400)]
closes #7162
Merge branch '7162-support-service-types'

8 years ago7162: Removed the call to get keep_disks when there is an error getting keep_services,
radhika [Fri, 25 Sep 2015 16:13:25 +0000 (12:13 -0400)]
7162: Removed the call to get keep_disks when there is an error getting keep_services,
since keep_services has been available since May 2014, #2776 according to Tom.

8 years agoMerge branch 'master' into 7162-support-service-types
radhika [Fri, 25 Sep 2015 16:05:44 +0000 (12:05 -0400)]
Merge branch 'master' into 7162-support-service-types

8 years agoMerge branch '7227-crunch-job-stricter-unmount-wip'
Brett Smith [Fri, 25 Sep 2015 14:46:00 +0000 (10:46 -0400)]
Merge branch '7227-crunch-job-stricter-unmount-wip'

Closes #7227, #7376.

8 years ago7227: crunch-job only unmounts Keep mounts under $CRUNCH_TMP.
Brett Smith [Wed, 23 Sep 2015 17:16:41 +0000 (13:16 -0400)]
7227: crunch-job only unmounts Keep mounts under $CRUNCH_TMP.

This prevents it from trying to unmount other Keep mounts elsewhere on
the system, and considering the cleanup step failed because of that.

8 years agoMerge branch '6967-application-yml-without-git-wip'
Brett Smith [Fri, 25 Sep 2015 14:38:37 +0000 (10:38 -0400)]
Merge branch '6967-application-yml-without-git-wip'

Closes #6967, #7375.

8 years ago6967: Extend application.default.yml source_version detection.
Brett Smith [Wed, 23 Sep 2015 15:38:06 +0000 (11:38 -0400)]
6967: Extend application.default.yml source_version detection.

* In production, get source_version from our package's
  git-commit.version, assuming it's available.
* When we get source information from Git, suppress errors from the
  user, and only use the information if all queries succeed.

8 years ago6967: Remove trailing whitespace in Workbench's application.default.yml.
Brett Smith [Wed, 23 Sep 2015 15:34:53 +0000 (11:34 -0400)]
6967: Remove trailing whitespace in Workbench's application.default.yml.

8 years ago7161: working
radhika [Fri, 25 Sep 2015 14:13:49 +0000 (10:13 -0400)]
7161: working

8 years agoMerge branch 'master' into 7161-support-all-service-types
radhika [Fri, 25 Sep 2015 12:32:46 +0000 (08:32 -0400)]
Merge branch 'master' into 7161-support-all-service-types

8 years agoMerge branch 'master' into 7162-support-service-types
radhika [Fri, 25 Sep 2015 12:29:59 +0000 (08:29 -0400)]
Merge branch 'master' into 7162-support-service-types

8 years ago7162: updated comment
radhika [Fri, 25 Sep 2015 12:28:04 +0000 (08:28 -0400)]
7162: updated comment

8 years agoMerge branch '7181-crunch-missing-git' closes #7181
Peter Amstutz [Thu, 24 Sep 2015 20:36:59 +0000 (16:36 -0400)]
Merge branch '7181-crunch-missing-git' closes #7181

8 years agoMerge branch '7228-crunch-dispatch-umask' closes #7228
Peter Amstutz [Thu, 24 Sep 2015 20:36:35 +0000 (16:36 -0400)]
Merge branch '7228-crunch-dispatch-umask' closes #7228

8 years ago7162: move replicasPerThread logic outside the for loop.
radhika [Thu, 24 Sep 2015 20:25:37 +0000 (16:25 -0400)]
7162: move replicasPerThread logic outside the for loop.

8 years ago7181: Check for [Errno 2] in the output and assume that means git is missing.
Peter Amstutz [Thu, 24 Sep 2015 19:53:16 +0000 (15:53 -0400)]
7181: Check for [Errno 2] in the output and assume that means git is missing.
Remove --quite to get more output if egg_info fails.  Use "warn" instead of
"print" because "print" doesn't seem to actually make it to the logs.

8 years ago7162: SetServiceRoots keepproxy hints only (revert my update).
radhika [Thu, 24 Sep 2015 19:22:15 +0000 (15:22 -0400)]
7162: SetServiceRoots keepproxy hints only (revert my update).

8 years ago7161: white space
radhika [Thu, 24 Sep 2015 18:57:40 +0000 (14:57 -0400)]
7161: white space

8 years ago7161: clarify max_replicas_per_service
radhika [Thu, 24 Sep 2015 18:52:39 +0000 (14:52 -0400)]
7161: clarify max_replicas_per_service

8 years agoMerge branch 'master' into 7162-support-service-types
radhika [Thu, 24 Sep 2015 15:42:58 +0000 (11:42 -0400)]
Merge branch 'master' into 7162-support-service-types

8 years ago7241: Add Delete, IndexTo, Touch, and Mtime.
Tom Clegg [Thu, 24 Sep 2015 05:55:54 +0000 (01:55 -0400)]
7241: Add Delete, IndexTo, Touch, and Mtime.

8 years ago7241: Add Put() and Check()
Tom Clegg [Wed, 23 Sep 2015 21:46:21 +0000 (17:46 -0400)]
7241: Add Put() and Check()

8 years agocloses #7329
radhika [Wed, 23 Sep 2015 21:03:33 +0000 (17:03 -0400)]
closes #7329
Merge branch '7329-empty-block-issue'

8 years ago7321: arvados/jobs Dockerfile installs python-pip.
Brett Smith [Wed, 23 Sep 2015 20:56:35 +0000 (16:56 -0400)]
7321: arvados/jobs Dockerfile installs python-pip.

This is also for arvados_sdk_version support.  I thought pip was a
dependency of virtualenv, but it's not.  Refs #7321.

8 years ago7241: Accept command line flags for Azure blob volumes.
Tom Clegg [Wed, 23 Sep 2015 20:44:26 +0000 (16:44 -0400)]
7241: Accept command line flags for Azure blob volumes.

8 years agoMerge branch 'master' into 7329-empty-block-issue
radhika [Wed, 23 Sep 2015 20:31:37 +0000 (16:31 -0400)]
Merge branch 'master' into 7329-empty-block-issue

8 years ago7329: improved TestableVolumeManagerFactory method signature, teardown logic, comment...
radhika [Wed, 23 Sep 2015 20:29:02 +0000 (16:29 -0400)]
7329: improved TestableVolumeManagerFactory method signature, teardown logic, comments and test file name.

8 years ago7321: arvados/jobs Dockerfile installs development headers.
Brett Smith [Wed, 23 Sep 2015 20:27:28 +0000 (16:27 -0400)]
7321: arvados/jobs Dockerfile installs development headers.

These are necessary to build all of the Python SDK's dependencies when
running a job that defines arvados_sdk_version.

Closes #7321.

8 years agoMerge branch 'master' into 7329-empty-block-issue
radhika [Wed, 23 Sep 2015 19:44:09 +0000 (15:44 -0400)]
Merge branch 'master' into 7329-empty-block-issue

8 years ago7161: Look for all service hints, not just keep proxy. Also, use thread count of...
radhika [Wed, 23 Sep 2015 19:32:44 +0000 (15:32 -0400)]
7161: Look for all service hints, not just keep proxy. Also, use thread count of 1 when it not a disk.

8 years ago7228: Set umask to 002 so cache files are created writable other processes with same...
Peter Amstutz [Wed, 23 Sep 2015 17:00:08 +0000 (13:00 -0400)]
7228: Set umask to 002 so cache files are created writable other processes with same GID.

8 years agoMerge branch '7225-collection-hang' closes #7225
Peter Amstutz [Wed, 23 Sep 2015 14:42:38 +0000 (10:42 -0400)]
Merge branch '7225-collection-hang' closes #7225

8 years ago7241: Add AzureBlobVolume
Tom Clegg [Tue, 22 Sep 2015 23:54:12 +0000 (19:54 -0400)]
7241: Add AzureBlobVolume

8 years ago7329: since moved functional testing into generic testing, removing now redundant...
radhika [Tue, 22 Sep 2015 22:25:53 +0000 (18:25 -0400)]
7329: since moved functional testing into generic testing, removing now redundant empty block tests from volume_unix_test.go and keepstore_test.go.

8 years ago7329: add generic volume based keepstore tests to have better functional test coverage.
radhika [Tue, 22 Sep 2015 22:16:15 +0000 (18:16 -0400)]
7329: add generic volume based keepstore tests to have better functional test coverage.

8 years ago7225: Better exception handling for unexpected state changes.
Peter Amstutz [Tue, 22 Sep 2015 20:58:21 +0000 (16:58 -0400)]
7225: Better exception handling for unexpected state changes.

8 years ago7225: Add test to validate fix that 2nd commit call blocks until block is committed
Peter Amstutz [Tue, 22 Sep 2015 19:23:31 +0000 (15:23 -0400)]
7225: Add test to validate fix that 2nd commit call blocks until block is committed
as intended.

8 years ago7225: Fix typo in _BufferBlock.set_state() that resulted in "wait for pending
Peter Amstutz [Tue, 22 Sep 2015 15:47:25 +0000 (11:47 -0400)]
7225: Fix typo in _BufferBlock.set_state() that resulted in "wait for pending
block commit" code getting skipped.  Set PUT thread to daemon thread; users
must call save() or flush() or use `with` to guarantee that blocks get written.

8 years agoMerge branch 'master' into 7329-empty-block-issue
radhika [Tue, 22 Sep 2015 16:47:26 +0000 (12:47 -0400)]
Merge branch 'master' into 7329-empty-block-issue

8 years ago7329: Fix infinite loop in Compare when reading an empty file.
Tom Clegg [Tue, 22 Sep 2015 16:01:25 +0000 (12:01 -0400)]
7329: Fix infinite loop in Compare when reading an empty file.

refs #7329

8 years ago7162: Update code to address the bug "current code forgets to reset Using_proxy to...
radhika [Tue, 22 Sep 2015 15:40:44 +0000 (11:40 -0400)]
7162: Update code to address the bug "current code forgets to reset Using_proxy to false if the API server stops giving out proxies between one call and the next"

8 years agoMerge branch 'master' into 7162-support-service-types
radhika [Tue, 22 Sep 2015 15:37:43 +0000 (11:37 -0400)]
Merge branch 'master' into 7162-support-service-types