arvados.git
9 years agoMerge branch '4759-timestamp-precision-TC' closes #4759
Tom Clegg [Tue, 17 Feb 2015 17:07:50 +0000 (12:07 -0500)]
Merge branch '4759-timestamp-precision-TC' closes #4759

9 years agocloses #5220
Radhika Chippada [Tue, 17 Feb 2015 15:25:24 +0000 (10:25 -0500)]
closes #5220
Merge branch '5220-no-sharing-box-for-anon-user'

9 years ago5220: whitespace cleanup.
Ward Vandewege [Tue, 17 Feb 2015 15:13:16 +0000 (10:13 -0500)]
5220: whitespace cleanup.

9 years ago4759: Add functional tests for timestamp precision.
Tom Clegg [Tue, 17 Feb 2015 06:35:41 +0000 (01:35 -0500)]
4759: Add functional tests for timestamp precision.

9 years ago4759: Add test for inequality filters.
Tom Clegg [Tue, 17 Feb 2015 03:36:03 +0000 (22:36 -0500)]
4759: Add test for inequality filters.

9 years ago4759: Ignore args to as_json.
Tom Clegg [Tue, 17 Feb 2015 03:35:20 +0000 (22:35 -0500)]
4759: Ignore args to as_json.

9 years ago5220: do not show "Sharing and permissions" box when an anonymous user is viewing...
Radhika Chippada [Mon, 16 Feb 2015 23:30:03 +0000 (18:30 -0500)]
5220: do not show "Sharing and permissions" box when an anonymous user is viewing a shared collection.

9 years agocloses #5189
Radhika Chippada [Mon, 16 Feb 2015 22:46:05 +0000 (17:46 -0500)]
closes #5189
Merge branch '5189-manage-acct-shows-own-repos'

9 years ago5189: a little cleanup
Radhika Chippada [Mon, 16 Feb 2015 22:45:01 +0000 (17:45 -0500)]
5189: a little cleanup

9 years agoMerge branch 'master' into 5189-manage-acct-shows-own-repos
Radhika Chippada [Mon, 16 Feb 2015 22:28:40 +0000 (17:28 -0500)]
Merge branch 'master' into 5189-manage-acct-shows-own-repos

9 years agoMerge branch '3410-replication-attrs' closes #3410 refs #5011
Tom Clegg [Mon, 16 Feb 2015 20:53:51 +0000 (15:53 -0500)]
Merge branch '3410-replication-attrs' closes #3410 refs #5011

9 years agoFix typo in COPYING.
Ward Vandewege [Mon, 16 Feb 2015 20:02:48 +0000 (15:02 -0500)]
Fix typo in COPYING.

No issue #

9 years ago3410: Merge branch 'master' into 3410-replication-attrs
Tom Clegg [Mon, 16 Feb 2015 19:13:00 +0000 (14:13 -0500)]
3410: Merge branch 'master' into 3410-replication-attrs

Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/unit/collection_test.rb

9 years ago4759: Use ISO 8601 timestamps with fractional seconds in API responses.
Tom Clegg [Mon, 16 Feb 2015 19:00:09 +0000 (14:00 -0500)]
4759: Use ISO 8601 timestamps with fractional seconds in API responses.

9 years agorefs #5096
Radhika Chippada [Mon, 16 Feb 2015 17:50:21 +0000 (12:50 -0500)]
refs #5096
Merge branch '5096-wb-collection-name-or-desc-update'

9 years agoMerge branch 'master' into 5096-wb-collection-name-or-desc-update
Radhika Chippada [Mon, 16 Feb 2015 17:46:00 +0000 (12:46 -0500)]
Merge branch 'master' into 5096-wb-collection-name-or-desc-update

Conflicts:
apps/workbench/test/controllers/collections_controller_test.rb

9 years ago5096: more efficient update method override.
Radhika Chippada [Mon, 16 Feb 2015 17:42:17 +0000 (12:42 -0500)]
5096: more efficient update method override.

9 years agoMerge branch 'master' into 5189-manage-acct-shows-own-repos
Radhika Chippada [Mon, 16 Feb 2015 16:33:55 +0000 (11:33 -0500)]
Merge branch 'master' into 5189-manage-acct-shows-own-repos

9 years agoMerge branch '5095-fuse-ls-takes-forever' closes #5095
Peter Amstutz [Mon, 16 Feb 2015 16:33:34 +0000 (11:33 -0500)]
Merge branch '5095-fuse-ls-takes-forever' closes #5095

9 years ago5189: include owned repositories in the list of repositories returned in manage_account.
Radhika Chippada [Mon, 16 Feb 2015 16:29:54 +0000 (11:29 -0500)]
5189: include owned repositories in the list of repositories returned in manage_account.

9 years ago5095: _mtime on collection defaults to 0 instead of time.time().
Peter Amstutz [Mon, 16 Feb 2015 16:01:58 +0000 (11:01 -0500)]
5095: _mtime on collection defaults to 0 instead of time.time().

9 years ago5095: Set _mtime when the collection object is updated.
Peter Amstutz [Mon, 16 Feb 2015 15:11:42 +0000 (10:11 -0500)]
5095: Set _mtime when the collection object is updated.

9 years agocloses #5186
Radhika Chippada [Mon, 16 Feb 2015 13:56:02 +0000 (08:56 -0500)]
closes #5186
Merge branch '5186-collection-with-empty-properties'

9 years ago5186: a few more test assertions.
Radhika Chippada [Mon, 16 Feb 2015 13:54:43 +0000 (08:54 -0500)]
5186: a few more test assertions.

9 years ago3410: Update comments.
Tom Clegg [Mon, 16 Feb 2015 08:12:43 +0000 (03:12 -0500)]
3410: Update comments.

9 years ago3410: Fix search index so [old versions of] tests pass after down-migration.
Tom Clegg [Mon, 16 Feb 2015 08:12:32 +0000 (03:12 -0500)]
3410: Fix search index so [old versions of] tests pass after down-migration.

9 years ago3410: Fix overly sensitive test.
Tom Clegg [Mon, 16 Feb 2015 08:11:23 +0000 (03:11 -0500)]
3410: Fix overly sensitive test.

9 years ago5186: collection properties attribute is a hash
Radhika Chippada [Sun, 15 Feb 2015 20:48:46 +0000 (15:48 -0500)]
5186: collection properties attribute is a hash

9 years ago3410: Update comments.
Tom Clegg [Sun, 15 Feb 2015 01:20:37 +0000 (20:20 -0500)]
3410: Update comments.

9 years ago3410: Rename maybe_clear_redundancy_confirmed to maybe_clear_replication_confirmed.
Tom Clegg [Sun, 15 Feb 2015 00:56:19 +0000 (19:56 -0500)]
3410: Rename maybe_clear_redundancy_confirmed to maybe_clear_replication_confirmed.

9 years ago5096: if only collection name or description is being updated, do not include manifes...
Radhika Chippada [Sat, 14 Feb 2015 23:46:14 +0000 (18:46 -0500)]
5096: if only collection name or description is being updated, do not include manifest_text in the request.

9 years agoEnsure result order is predictable, even if client-provided orders do not specify...
Tom Clegg [Sat, 14 Feb 2015 21:54:00 +0000 (16:54 -0500)]
Ensure result order is predictable, even if client-provided orders do not specify a complete ordering.

Fixes intermittent test failures. Example (from
https://ci.curoverse.com/job/arvados-api-server/1305/console):

GroupsTest#test_get_all_pages_of_group-owned_objects [/data/1/jenkins/workspace/arvados-api-server/services/api/test/integration/groups_test.rb:31]:
Received 'zzzzz-4zz18-fy296fx3hot09f7' again on page 3.
<nil> expected but was
<true>.

No issue #

9 years agoMerge branch '5011-thread-safe-test' refs #5011
Tom Clegg [Sat, 14 Feb 2015 22:02:12 +0000 (17:02 -0500)]
Merge branch '5011-thread-safe-test' refs #5011

9 years agoMerge branch '5200-anonymous-download'
Ward Vandewege [Sat, 14 Feb 2015 13:39:46 +0000 (08:39 -0500)]
Merge branch '5200-anonymous-download'

Closes #5200

9 years agoMerge branch 'master' into 5200-anonymous-download
Ward Vandewege [Sat, 14 Feb 2015 13:39:15 +0000 (08:39 -0500)]
Merge branch 'master' into 5200-anonymous-download

9 years ago5095: Record mtime() from group#contents
Peter Amstutz [Fri, 13 Feb 2015 21:22:43 +0000 (16:22 -0500)]
5095: Record mtime() from group#contents

9 years ago5095: Don't check update when getting mtime().
Peter Amstutz [Fri, 13 Feb 2015 21:12:02 +0000 (16:12 -0500)]
5095: Don't check update when getting mtime().

9 years agoMerge branch '5037-nonocache' closes #5037
Tom Clegg [Fri, 13 Feb 2015 19:03:13 +0000 (14:03 -0500)]
Merge branch '5037-nonocache' closes #5037

9 years agoMerge branch '5030-hide-graph-until-data' closes #5030
Tom Clegg [Fri, 13 Feb 2015 18:17:36 +0000 (13:17 -0500)]
Merge branch '5030-hide-graph-until-data' closes #5030

9 years ago5011: Fix unreliable test.
Tom Clegg [Fri, 13 Feb 2015 00:04:01 +0000 (19:04 -0500)]
5011: Fix unreliable test.

The collection writer was (sometimes) consuming the last 200 response
even though it could write 3 copies without it. This shouldn't fail
the test: the only reason we count the PUT calls is to verify all
three of the 200 responses were consumed (i.e., none of the 500
responses were counted toward the achieved replication level). To
verify this without being sensitive to extra requests, we simply
arrange for the three 200 responses to be the last ones available.

9 years ago5011: Use a threadsafe wrapper to feed side effects to mocks.
Tom Clegg [Thu, 12 Feb 2015 23:56:02 +0000 (18:56 -0500)]
5011: Use a threadsafe wrapper to feed side effects to mocks.

9 years ago5200: Fix overly sensitive fuse test. (Do not fail every time a fixture is added.)
Tom Clegg [Thu, 12 Feb 2015 23:23:38 +0000 (18:23 -0500)]
5200: Fix overly sensitive fuse test. (Do not fail every time a fixture is added.)

9 years ago5200: Do not fail tests if application.yml is missing: defaults are enough to pass...
Tom Clegg [Thu, 12 Feb 2015 22:42:16 +0000 (17:42 -0500)]
5200: Do not fail tests if application.yml is missing: defaults are enough to pass tests.

9 years ago5200: Enable anonymous file view/download.
Tom Clegg [Thu, 12 Feb 2015 22:09:17 +0000 (17:09 -0500)]
5200: Enable anonymous file view/download.

9 years agoMerge branch '4839-worker-state' closes #4839
Tom Clegg [Thu, 12 Feb 2015 19:24:55 +0000 (14:24 -0500)]
Merge branch '4839-worker-state' closes #4839

9 years agoMerge branch '4904-arv-web' closes #4904
Peter Amstutz [Thu, 12 Feb 2015 18:53:34 +0000 (13:53 -0500)]
Merge branch '4904-arv-web' closes #4904

9 years agoMerge branch 'master' into 4904-arv-web
Peter Amstutz [Thu, 12 Feb 2015 18:52:48 +0000 (13:52 -0500)]
Merge branch 'master' into 4904-arv-web

9 years ago4904: Remove extraneous ciddir and cidfilepath. Explicit non-zero exit code
Peter Amstutz [Thu, 12 Feb 2015 18:52:28 +0000 (13:52 -0500)]
4904: Remove extraneous ciddir and cidfilepath.  Explicit non-zero exit code
when an ArgumentError is caught.

9 years ago4839: Use node[crunch_worker_state], not node[info][slurm_state], to make shutdown...
Tom Clegg [Thu, 12 Feb 2015 18:35:35 +0000 (13:35 -0500)]
4839: Use node[crunch_worker_state], not node[info][slurm_state], to make shutdown decisions.

9 years agoNode Manager daemon tests avoid checking monitor.is_alive().
Brett Smith [Thu, 12 Feb 2015 16:43:38 +0000 (11:43 -0500)]
Node Manager daemon tests avoid checking monitor.is_alive().

Checking is_alive() creates race conditions, because we might check
the actor's live state before it's had a chance to process a stop
message in its queue.  We just had a build fail because of this:
<https://ci.curoverse.com/job/arvados-api-server/1299/>.  Always check
that a monitor is alive by sending it a real message.  No issue #.

9 years agoFix undependable test (incorrectly assumed a particular job would be on the first...
Tom Clegg [Thu, 12 Feb 2015 15:57:36 +0000 (10:57 -0500)]
Fix undependable test (incorrectly assumed a particular job would be on the first page of /jobs). No issue #

9 years agoMerge branch '4951-request-vm-TC' refs #4951
Tom Clegg [Thu, 12 Feb 2015 15:19:42 +0000 (10:19 -0500)]
Merge branch '4951-request-vm-TC' refs #4951

9 years ago4951: Empty out ActionMailer::Base.deliveries so we can count deliveries caused by...
Tom Clegg [Thu, 12 Feb 2015 15:13:46 +0000 (10:13 -0500)]
4951: Empty out ActionMailer::Base.deliveries so we can count deliveries caused by the current test.

9 years ago4951: Rearrange js to make use of Rails built-ins. Add generic AJAX error handler.
Tom Clegg [Thu, 12 Feb 2015 08:18:52 +0000 (03:18 -0500)]
4951: Rearrange js to make use of Rails built-ins. Add generic AJAX error handler.

9 years ago4951: Add localStorage to browser dependency checks.
Tom Clegg [Thu, 12 Feb 2015 07:54:34 +0000 (02:54 -0500)]
4951: Add localStorage to browser dependency checks.

9 years ago4951: fix comment in test
Radhika Chippada [Thu, 12 Feb 2015 01:58:02 +0000 (20:58 -0500)]
4951: fix comment in test

9 years ago4951: update test to also verify that an email was sent when request shell access...
Radhika Chippada [Thu, 12 Feb 2015 00:32:02 +0000 (19:32 -0500)]
4951: update test to also verify that an email was sent when request shell access button was clicked.

9 years agoMerge branch 'master' into 4951-request-vm
Radhika Chippada [Thu, 12 Feb 2015 00:23:26 +0000 (19:23 -0500)]
Merge branch 'master' into 4951-request-vm

9 years agocloses #5185
Radhika Chippada [Thu, 12 Feb 2015 00:22:56 +0000 (19:22 -0500)]
closes #5185
Merge branch '5185-collections-tab-zero-size-issue'

9 years ago3410: Fix munge_manifest_locators!: don't skip locators that have no +hints.
Tom Clegg [Sat, 7 Feb 2015 02:36:39 +0000 (21:36 -0500)]
3410: Fix munge_manifest_locators!: don't skip locators that have no +hints.

Also, fix portable_manifest_text: do not add a trailing + to a locator
that has no size hint.

Portable data hash of ". d41d8cd98f00b204e9800998ecf8427e+Foo 0:0:x\n"
is md5(". d41d8cd98f00b204e9800998ecf8427e 0:0:x\n")
not md5(". d41d8cd98f00b204e9800998ecf8427e+ 0:0:x\n")

9 years ago3410: Add tests for replication attributes.
Tom Clegg [Sat, 7 Feb 2015 00:07:43 +0000 (19:07 -0500)]
3410: Add tests for replication attributes.

9 years ago3410: Add replication attributes (and rules about updating them) to model and docs.
Tom Clegg [Fri, 6 Feb 2015 23:51:12 +0000 (18:51 -0500)]
3410: Add replication attributes (and rules about updating them) to model and docs.

9 years ago3410: Add default_collection_replication to config and discovery doc.
Tom Clegg [Fri, 6 Feb 2015 23:49:59 +0000 (18:49 -0500)]
3410: Add default_collection_replication to config and discovery doc.

9 years ago3410: Rename redundancy -> replication columns.
Tom Clegg [Fri, 6 Feb 2015 23:49:33 +0000 (18:49 -0500)]
3410: Rename redundancy -> replication columns.

9 years ago5185: remove the unnecessary test because another test is covering the description...
Radhika Chippada [Wed, 11 Feb 2015 23:46:07 +0000 (18:46 -0500)]
5185: remove the unnecessary test because another test is covering the description column check already.

9 years ago5185: do not display description at all in Project -> Data collections tab because...
Radhika Chippada [Wed, 11 Feb 2015 23:44:25 +0000 (18:44 -0500)]
5185: do not display description at all in Project -> Data collections tab because of concerns such as the description may be too big or has textile etc.

9 years ago4951: button_to cannot be used to submit; instead change to link_to
Radhika Chippada [Wed, 11 Feb 2015 23:40:23 +0000 (18:40 -0500)]
4951: button_to cannot be used to submit; instead change to link_to

9 years ago5185: in project data collections tab, show description when available; otherwise...
Radhika Chippada [Wed, 11 Feb 2015 22:32:37 +0000 (17:32 -0500)]
5185: in project data collections tab, show description when available; otherwise display modified time.

9 years agocloses #4951
Radhika Chippada [Wed, 11 Feb 2015 21:35:44 +0000 (16:35 -0500)]
closes #4951
Merge branch '4951-request-vm'

9 years agoMerge branch 'master' into 4904-arv-web
Peter Amstutz [Wed, 11 Feb 2015 21:01:24 +0000 (16:01 -0500)]
Merge branch 'master' into 4904-arv-web

Conflicts:
sdk/python/arvados/events.py

9 years ago4904: Detach from Docker container to get cid from stdout instead of fiddling
Peter Amstutz [Wed, 11 Feb 2015 20:48:00 +0000 (15:48 -0500)]
4904: Detach from Docker container to get cid from stdout instead of fiddling
with cid file.  Poll "docker ps" to check if the container is still running.  Fixed bugs.
Updated documentation.

9 years agoMerge branch 'master' into 4951-request-vm
Radhika Chippada [Wed, 11 Feb 2015 20:05:24 +0000 (15:05 -0500)]
Merge branch 'master' into 4951-request-vm

9 years agocloses #5110
Radhika Chippada [Wed, 11 Feb 2015 20:02:49 +0000 (15:02 -0500)]
closes #5110
Merge branch '5110-workbench-full-text-search'

9 years ago5110: update a comment in test; this comment was reflecting ui from before project...
Radhika Chippada [Wed, 11 Feb 2015 20:01:28 +0000 (15:01 -0500)]
5110: update a comment in test; this comment was reflecting ui from before project tabs.

9 years ago5110: update couple more tests to do a single visit to page than visit home and then...
Radhika Chippada [Wed, 11 Feb 2015 19:58:28 +0000 (14:58 -0500)]
5110: update couple more tests to do a single visit to page than visit home and then visit page.

9 years agoMerge branch 'master' into 5110-workbench-full-text-search
Radhika Chippada [Wed, 11 Feb 2015 19:49:26 +0000 (14:49 -0500)]
Merge branch 'master' into 5110-workbench-full-text-search

9 years ago4904: Refactor arv-web main() into ArvWeb class. Add CollectionDirectory.change_coll...
Peter Amstutz [Wed, 11 Feb 2015 19:33:12 +0000 (14:33 -0500)]
4904: Refactor arv-web main() into ArvWeb class.  Add CollectionDirectory.change_collection to FUSE.

9 years ago4951: Incorporate review feedback. Always show the request button, along with the...
Radhika Chippada [Wed, 11 Feb 2015 19:07:24 +0000 (14:07 -0500)]
4951: Incorporate review feedback. Always show the request button, along with the "sent" message if applicable. Include timestamp in sent message. Some text updates as well.

9 years agoMerge branch 'master' into 4951-request-vm
Radhika Chippada [Wed, 11 Feb 2015 17:05:35 +0000 (12:05 -0500)]
Merge branch 'master' into 4951-request-vm

9 years agoMerge branch '4958-old-browser-alert' closes #4958
Tom Clegg [Tue, 10 Feb 2015 22:50:38 +0000 (17:50 -0500)]
Merge branch '4958-old-browser-alert' closes #4958

9 years ago4958: Merge branch 'master' into 4958-old-browser-alert
Tom Clegg [Tue, 10 Feb 2015 22:12:16 +0000 (17:12 -0500)]
4958: Merge branch 'master' into 4958-old-browser-alert

9 years ago4958: Tweak wording. Fix margins.
Tom Clegg [Tue, 10 Feb 2015 22:08:57 +0000 (17:08 -0500)]
4958: Tweak wording. Fix margins.

9 years ago4958: Test WebSocket support.
Tom Clegg [Tue, 10 Feb 2015 22:02:10 +0000 (17:02 -0500)]
4958: Test WebSocket support.

9 years ago4958: Rename test file.
Tom Clegg [Tue, 10 Feb 2015 22:02:00 +0000 (17:02 -0500)]
4958: Rename test file.

9 years agoFix javascript errors when closing modal. refs #5183
Tom Clegg [Tue, 10 Feb 2015 21:42:04 +0000 (16:42 -0500)]
Fix javascript errors when closing modal. refs #5183

9 years ago5183: Disable animation on modal. (It seems to cause intermittent test failures....
Tom Clegg [Tue, 10 Feb 2015 21:22:37 +0000 (16:22 -0500)]
5183: Disable animation on modal. (It seems to cause intermittent test failures.) refs #5183

9 years agoMerge branch '5160-share-with-anonymous-group-wip'
Brett Smith [Tue, 10 Feb 2015 19:14:51 +0000 (14:14 -0500)]
Merge branch '5160-share-with-anonymous-group-wip'

Closes #5160, #5163.

9 years ago5160: Workbench hides anonymous sharing when browsing disabled.
Brett Smith [Tue, 10 Feb 2015 16:33:59 +0000 (11:33 -0500)]
5160: Workbench hides anonymous sharing when browsing disabled.

This commit updates Workbench to filter out the anonymous group from
the group sharing modal when anonymous browsing is disabled.  That
helps avoid situations where users think their work is publicly
sharable, but that's been disabled by the administrator.

9 years ago5160: Make anonymous group fixture match database seed.
Brett Smith [Tue, 10 Feb 2015 16:25:16 +0000 (11:25 -0500)]
5160: Make anonymous group fixture match database seed.

Refer to /services/api/app/models/database_seeds.rb.

9 years ago5160: Fix typo in Workbench default config comments.
Brett Smith [Tue, 10 Feb 2015 14:00:01 +0000 (09:00 -0500)]
5160: Fix typo in Workbench default config comments.

9 years ago5160: All users have API read permission to anonymous group.
Brett Smith [Tue, 10 Feb 2015 19:11:55 +0000 (14:11 -0500)]
5160: All users have API read permission to anonymous group.

Workbench makes public data available to everyone by including the
anonymous user API token as a reader token for every request.
However, model-level validations do not respect reader tokens.  As a
consequence, users cannot make their project public by sharing it with
the anonymous group.  They can't create the necessary link, because
the validation can't confirm that the creator can see the anonymous
group.

There are a few ways we could've tackled this, but granting all users
permission to see the anonymous group seems like the most reliable,
since it works within our existing permissions infrastructure as much
as possible.

9 years agoMerge branch 'master' into 5110-workbench-full-text-search
Radhika Chippada [Tue, 10 Feb 2015 16:01:10 +0000 (11:01 -0500)]
Merge branch 'master' into 5110-workbench-full-text-search

9 years agorefs #4523 : Add postgres full text search support
Radhika Chippada [Tue, 10 Feb 2015 15:58:44 +0000 (10:58 -0500)]
refs #4523 : Add postgres full text search support
Merge branch '4523-full-text-search'

9 years ago5110: update comment
Radhika Chippada [Tue, 10 Feb 2015 15:47:34 +0000 (10:47 -0500)]
5110: update comment

9 years agoMerge branch '4523-full-text-search' into 5110-workbench-full-text-search
Radhika Chippada [Tue, 10 Feb 2015 15:42:15 +0000 (10:42 -0500)]
Merge branch '4523-full-text-search' into 5110-workbench-full-text-search

9 years agoMerge branch 'master' into 5110-workbench-full-text-search
Radhika Chippada [Tue, 10 Feb 2015 15:42:02 +0000 (10:42 -0500)]
Merge branch 'master' into 5110-workbench-full-text-search

9 years agoMerge branch 'master' into 4523-full-text-search
Radhika Chippada [Tue, 10 Feb 2015 15:41:44 +0000 (10:41 -0500)]
Merge branch 'master' into 4523-full-text-search

9 years ago5037: Remove git tags from SDK version restrictions.
Tom Clegg [Tue, 10 Feb 2015 14:53:15 +0000 (09:53 -0500)]
5037: Remove git tags from SDK version restrictions.

9 years ago5037: Merge branch 'master' into 5037-nonocache
Tom Clegg [Tue, 10 Feb 2015 14:55:02 +0000 (09:55 -0500)]
5037: Merge branch 'master' into 5037-nonocache

9 years agoFix typo.
Ward Vandewege [Tue, 10 Feb 2015 04:39:46 +0000 (23:39 -0500)]
Fix typo.

refs #4754