arvados.git
10 years ago3775: Add TODO comments in suspicious-looking collate_output corners.
Tom Clegg [Fri, 3 Oct 2014 14:17:07 +0000 (10:17 -0400)]
3775: Add TODO comments in suspicious-looking collate_output corners.

10 years ago3775: Run local/dev jobs on code from arbitrary remote git repositories.
Tom Clegg [Fri, 3 Oct 2014 14:16:16 +0000 (10:16 -0400)]
3775: Run local/dev jobs on code from arbitrary remote git repositories.

* repository is a local path X -> use local repository X or X/.git.

* repository is a git url (git://, https://, git@host:repo.git, etc)
  fetch branches, tags, and objects from the remote and use the result
  to resolve script_version to a commit sha1 and run the job.

* else -> look up the named repository in Arvados and use its
  fetch_url as a remote git url as above.

* --git-dir is given on the command line -> use that instead of
  $Job->{repository} in the above logic. (This isn't new. It ensures
  we don't go off fetching arbitrary remotes when crunch-dispatch.rb
  has already pulled the code into its own internal git repo.)

Incidental changes:

* Lose support for looking up subversion revision numbers using
  git-svn tags.

* Lose support for CRUNCH_DEFAULT_GIT_DIR environment variable. Pass
  --git-dir instead.

* Improve log messages during checkout/install phase.

10 years ago4036: add comment for flash alert div
radhika [Fri, 3 Oct 2014 14:13:10 +0000 (10:13 -0400)]
4036: add comment for flash alert div

10 years agoMerge branch 'master' into 4036-combine-collections-in-project-issue
radhika [Fri, 3 Oct 2014 14:05:59 +0000 (10:05 -0400)]
Merge branch 'master' into 4036-combine-collections-in-project-issue

10 years ago3775: Remove stagnant $job_has_uuid flag. Every job has a uuid. The
Tom Clegg [Fri, 3 Oct 2014 13:42:33 +0000 (09:42 -0400)]
3775: Remove stagnant $job_has_uuid flag. Every job has a uuid. The
only time to skip updating the job record on the server side is when
croak() happens before $Job is created/fetched.

10 years ago3775: Fix syntax error 2 commits ago.
Tom Clegg [Fri, 3 Oct 2014 13:33:46 +0000 (09:33 -0400)]
3775: Fix syntax error 2 commits ago.

10 years agoMerge branch 'master' into 3634-tab-state
Phil Hodgson [Fri, 3 Oct 2014 12:35:06 +0000 (08:35 -0400)]
Merge branch 'master' into 3634-tab-state

10 years ago4025: add fa-fw to the newly added i tag class like all other such usages.
radhika [Fri, 3 Oct 2014 11:34:33 +0000 (07:34 -0400)]
4025: add fa-fw to the newly added i tag class like all other such usages.

10 years ago4205: add tooltips to pipeline instance tab line buttons
radhika [Fri, 3 Oct 2014 11:15:23 +0000 (07:15 -0400)]
4205: add tooltips to pipeline instance tab line buttons

10 years agoMerge branch 'master' into 4025-move-project-button-label
radhika [Fri, 3 Oct 2014 00:08:54 +0000 (20:08 -0400)]
Merge branch 'master' into 4025-move-project-button-label

10 years ago4025: add tooltips to some of the tab line buttons and also adjust the title of the...
radhika [Fri, 3 Oct 2014 00:07:11 +0000 (20:07 -0400)]
4025: add tooltips to some of the tab line buttons and also adjust the title of the "Move" button.

10 years ago4042: Getting started on run-command reference
Peter Amstutz [Thu, 2 Oct 2014 21:11:23 +0000 (17:11 -0400)]
4042: Getting started on run-command reference

10 years ago3825: write log output directly to a pipe.
Tim Pierce [Thu, 2 Oct 2014 18:40:25 +0000 (14:40 -0400)]
3825: write log output directly to a pipe.

Added functions:
* start_output_log($logfilename)
* write_output_log($txt)
* finish_output_log()
* output_log_is_active()

Rewrote all code that referenced $local_logfile in terms of these
functions.

10 years agoMerge branch '3769-throttle-logs' closes #3769
Peter Amstutz [Thu, 2 Oct 2014 20:33:16 +0000 (16:33 -0400)]
Merge branch '3769-throttle-logs' closes #3769

10 years ago3769: Spelling fix and remove debugging puts.
Peter Amstutz [Thu, 2 Oct 2014 20:32:02 +0000 (16:32 -0400)]
3769: Spelling fix and remove debugging puts.

10 years ago4042: Start working on run-command reference page.
Peter Amstutz [Thu, 2 Oct 2014 20:29:55 +0000 (16:29 -0400)]
4042: Start working on run-command reference page.

10 years ago4042: another expand fix
Peter Amstutz [Thu, 2 Oct 2014 19:18:27 +0000 (15:18 -0400)]
4042: another expand fix

10 years ago4042: expand list fix
Peter Amstutz [Thu, 2 Oct 2014 19:15:08 +0000 (15:15 -0400)]
4042: expand list fix

10 years ago4036: correct div class
radhika [Thu, 2 Oct 2014 19:13:26 +0000 (15:13 -0400)]
4036: correct div class

10 years ago4042: add command pattern to list index
Peter Amstutz [Thu, 2 Oct 2014 19:12:14 +0000 (15:12 -0400)]
4042: add command pattern to list index

10 years ago4042: fix bad keys
Peter Amstutz [Thu, 2 Oct 2014 19:04:35 +0000 (15:04 -0400)]
4042: fix bad keys

10 years ago4042: fix bad syntax
Peter Amstutz [Thu, 2 Oct 2014 19:01:46 +0000 (15:01 -0400)]
4042: fix bad syntax

10 years ago4042: Add list index
Peter Amstutz [Thu, 2 Oct 2014 18:58:20 +0000 (14:58 -0400)]
4042: Add list index

10 years ago3583: extend encode quotes logic for script parameters as well, just in case.
radhika [Thu, 2 Oct 2014 18:54:59 +0000 (14:54 -0400)]
3583: extend encode quotes logic for script parameters as well, just in case.

10 years ago4042: add "extract"
Peter Amstutz [Thu, 2 Oct 2014 18:49:58 +0000 (14:49 -0400)]
4042: add "extract"

10 years ago4042: list handling bugfix
Peter Amstutz [Thu, 2 Oct 2014 18:02:21 +0000 (14:02 -0400)]
4042: list handling bugfix

10 years ago4042: Fix syntax error
Peter Amstutz [Thu, 2 Oct 2014 17:53:27 +0000 (13:53 -0400)]
4042: Fix syntax error

10 years ago4042: Add support for filter and group of lists
Peter Amstutz [Thu, 2 Oct 2014 17:44:47 +0000 (13:44 -0400)]
4042: Add support for filter and group of lists

10 years agoMerge branch 'master' into 3583-provenance-graph-issue
radhika [Thu, 2 Oct 2014 16:19:54 +0000 (12:19 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue

10 years ago4042: task.foreach should now accept multiple parameters and generate tasks
Peter Amstutz [Thu, 2 Oct 2014 15:46:24 +0000 (11:46 -0400)]
4042: task.foreach should now accept multiple parameters and generate tasks
based on the cartesian product of all input lists.

10 years ago4036: update the test that combines files from within a collection to expect the...
radhika [Thu, 2 Oct 2014 15:43:09 +0000 (11:43 -0400)]
4036: update the test that combines files from within a collection to expect the new collection in current project, if applicable and writable.

10 years ago3775: Merge branch 'master' into 3775-fetch-git-repo
Tom Clegg [Thu, 2 Oct 2014 15:13:19 +0000 (11:13 -0400)]
3775: Merge branch 'master' into 3775-fetch-git-repo

10 years agoMerge branch 'master' into 4036-combine-collections-in-project-issue
radhika [Thu, 2 Oct 2014 15:01:35 +0000 (11:01 -0400)]
Merge branch 'master' into 4036-combine-collections-in-project-issue

10 years ago4036: when files in a collection are combined, create the new collection in the origi...
radhika [Thu, 2 Oct 2014 14:59:50 +0000 (10:59 -0400)]
4036: when files in a collection are combined, create the new collection in the original collection's project, provided it is writable.

10 years agoMerge branch 'master' into 3769-throttle-logs
Peter Amstutz [Thu, 2 Oct 2014 14:52:47 +0000 (10:52 -0400)]
Merge branch 'master' into 3769-throttle-logs

Conflicts:
services/api/script/crunch-dispatch.rb

10 years agoMerge branch '3052-crunch-log-stdout' closes #3052
Peter Amstutz [Thu, 2 Oct 2014 14:51:36 +0000 (10:51 -0400)]
Merge branch '3052-crunch-log-stdout' closes #3052

10 years agoMerge branch 'master' into 3052-crunch-log-stdout
Peter Amstutz [Thu, 2 Oct 2014 14:46:37 +0000 (10:46 -0400)]
Merge branch 'master' into 3052-crunch-log-stdout

10 years ago3052: Change ruby style ruby style {:stderr => ''} to json style {stderr: ''}
Peter Amstutz [Thu, 2 Oct 2014 14:46:23 +0000 (10:46 -0400)]
3052: Change ruby style ruby style {:stderr => ''} to json style {stderr: ''}

10 years agoMerge branch '3782-large-job-logs'
Tim Pierce [Thu, 2 Oct 2014 14:44:30 +0000 (10:44 -0400)]
Merge branch '3782-large-job-logs'

Closes #3782.

10 years ago3782: fix FuseSharedTest
Tim Pierce [Thu, 2 Oct 2014 14:44:13 +0000 (10:44 -0400)]
3782: fix FuseSharedTest

10 years ago4036: update combine collection tests to expect the newly created collection in the...
radhika [Thu, 2 Oct 2014 14:29:04 +0000 (10:29 -0400)]
4036: update combine collection tests to expect the newly created collection in the right project.

10 years agoAdd test fixture to fix "test_cancel_someone_else's_visible_job" refs #3859
Peter Amstutz [Thu, 2 Oct 2014 13:22:28 +0000 (09:22 -0400)]
Add test fixture to fix "test_cancel_someone_else's_visible_job" refs #3859

10 years ago4036: improve rails flash message display to check if the message is an error.
radhika [Thu, 2 Oct 2014 12:32:05 +0000 (08:32 -0400)]
4036: improve rails flash message display to check if the message is an error.

10 years agoMerge branch 'master' into 3583-provenance-graph-issue
radhika [Thu, 2 Oct 2014 10:49:45 +0000 (06:49 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue

10 years ago3583: replace " characters with \" in node value to ensure graph does not get mixed...
radhika [Thu, 2 Oct 2014 10:49:15 +0000 (06:49 -0400)]
3583: replace " characters with \" in node value to ensure graph does not get mixed up on node labels.

10 years agoMerge branch 'master' of git.curoverse.com:arvados into 4036-combine-collections...
radhika [Thu, 2 Oct 2014 10:37:25 +0000 (06:37 -0400)]
Merge branch 'master' of git.curoverse.com:arvados into 4036-combine-collections-in-project-issue

10 years ago4046: when combining collections in a project, set current project as owner (if writa...
radhika [Thu, 2 Oct 2014 10:35:50 +0000 (06:35 -0400)]
4046: when combining collections in a project, set current project as owner (if writable) and show the new collection.

10 years agoMerge branch '3859-api-job-lock-method' refs #3859
Peter Amstutz [Thu, 2 Oct 2014 02:01:19 +0000 (22:01 -0400)]
Merge branch '3859-api-job-lock-method' refs #3859

10 years ago3769: Tweak throttle/truncate messages and application.default.yml defaults.
Peter Amstutz [Thu, 2 Oct 2014 01:59:59 +0000 (21:59 -0400)]
3769: Tweak throttle/truncate messages and application.default.yml defaults.

10 years ago3769: Add rate_limit with log throttling logic. Multiple configuration
Peter Amstutz [Wed, 1 Oct 2014 21:12:52 +0000 (17:12 -0400)]
3769: Add rate_limit with log throttling logic.  Multiple configuration
parameters to throttle excessive logging by bytes, lines, logs table events,
and total logged output.

10 years ago3782: code review feedback
Tim Pierce [Wed, 1 Oct 2014 20:52:17 +0000 (16:52 -0400)]
3782: code review feedback

* Fixed whitespace, JavaScript style in _show_log.html.erb
* Removed unused bytecount variable from file_enumerator
* Changed the new job and collection fixtures to have the job uuid match
  the uuid listed in the log.

10 years ago3782: added state to job fixture
Tim Pierce [Wed, 1 Oct 2014 20:04:05 +0000 (16:04 -0400)]
3782: added state to job fixture

10 years agoMerge branch 'master' into 3782-large-job-logs
Tim Pierce [Wed, 1 Oct 2014 19:43:15 +0000 (15:43 -0400)]
Merge branch 'master' into 3782-large-job-logs

Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml

10 years agoMerge branch '3782-stub-file-content' refs #3782
Tom Clegg [Wed, 1 Oct 2014 19:36:46 +0000 (15:36 -0400)]
Merge branch '3782-stub-file-content' refs #3782

10 years ago3782: Merge branch 'master' into 3782-stub-file-content
Tom Clegg [Wed, 1 Oct 2014 19:35:33 +0000 (15:35 -0400)]
3782: Merge branch 'master' into 3782-stub-file-content

10 years agoMerge branch '3052-crunch-log-stdout' into 3769-throttle-logs
Peter Amstutz [Wed, 1 Oct 2014 19:23:23 +0000 (15:23 -0400)]
Merge branch '3052-crunch-log-stdout' into 3769-throttle-logs

10 years ago3782: Use stubbed file content for "inactive user can retrieve user agreement" test.
Tom Clegg [Wed, 1 Oct 2014 19:12:07 +0000 (15:12 -0400)]
3782: Use stubbed file content for "inactive user can retrieve user agreement" test.

10 years agoMerge branch '4000-rerun-pipeline-changed-template'
Tim Pierce [Wed, 1 Oct 2014 18:59:30 +0000 (14:59 -0400)]
Merge branch '4000-rerun-pipeline-changed-template'

Closes #4000.

10 years ago4000: update both functional tests.
Tim Pierce [Wed, 1 Oct 2014 18:58:58 +0000 (14:58 -0400)]
4000: update both functional tests.

10 years agoMerge branch 'master' into 3769-throttle-logs
Peter Amstutz [Wed, 1 Oct 2014 18:33:23 +0000 (14:33 -0400)]
Merge branch 'master' into 3769-throttle-logs

10 years ago4000: tighten up functional test
Tim Pierce [Wed, 1 Oct 2014 18:28:38 +0000 (14:28 -0400)]
4000: tighten up functional test

Updated the test to ensure that a copied pipeline instance actually has
the expected script_parameters from both the source instance and source
template, respectively.

10 years agoUse job state field instead of running/success columns. refs #3898
Peter Amstutz [Wed, 1 Oct 2014 18:23:21 +0000 (14:23 -0400)]
Use job state field instead of running/success columns. refs #3898

10 years ago3782: bugfix and added integration test
Tim Pierce [Wed, 1 Oct 2014 17:50:53 +0000 (13:50 -0400)]
3782: bugfix and added integration test

* Fixed bug where log viewer would always request partial log and receive
  206, even when total log size is shorter than log_viewer_max_bytes.
* Added integration tests:
** set up KEEP_LOCAL_STORE with dummy log
** test retrieving full job log
** test retrieving partial job log

10 years agoMerge branch 'master' into 3583-provenance-graph-issue
radhika [Wed, 1 Oct 2014 17:33:37 +0000 (13:33 -0400)]
Merge branch 'master' into 3583-provenance-graph-issue

10 years ago3583: replace " characters with ' characters in node value to ensure graph does not...
radhika [Wed, 1 Oct 2014 17:31:15 +0000 (13:31 -0400)]
3583: replace " characters with ' characters in node value to ensure graph does not get mixed up on node labels.

10 years ago3859: unit test for job state changes
Peter Amstutz [Wed, 1 Oct 2014 17:06:17 +0000 (13:06 -0400)]
3859: unit test for job state changes

10 years ago3782: Merge branch 'master' into 3782-stub-file-content
Tom Clegg [Wed, 1 Oct 2014 16:08:01 +0000 (12:08 -0400)]
3782: Merge branch 'master' into 3782-stub-file-content

10 years ago3782: Remove obsolete helper method.
Tom Clegg [Wed, 1 Oct 2014 16:07:58 +0000 (12:07 -0400)]
3782: Remove obsolete helper method.

10 years ago3769: Allow up to crunch_limit_log_event_throttle_rate per
Peter Amstutz [Wed, 1 Oct 2014 16:00:25 +0000 (12:00 -0400)]
3769: Allow up to crunch_limit_log_event_throttle_rate per
crunch_limit_log_event_throttle_period, then silence the logs until the next
crunch_limit_log_event_throttle_period.

10 years ago3859: Added AlreadyLockedError for job lock conflict. Added runningbarbaz
Peter Amstutz [Wed, 1 Oct 2014 15:23:37 +0000 (11:23 -0400)]
3859: Added AlreadyLockedError for job lock conflict.  Added runningbarbaz
fixture so test "cancel someone else's visible job" is testing the right thing.

10 years agoMerge branch '4004-restore-dashboard-buttons' closes #4004
Peter Amstutz [Wed, 1 Oct 2014 13:47:01 +0000 (09:47 -0400)]
Merge branch '4004-restore-dashboard-buttons' closes #4004

10 years ago4004: Add newlines for readability
Peter Amstutz [Wed, 1 Oct 2014 13:46:14 +0000 (09:46 -0400)]
4004: Add newlines for readability

10 years ago3775: Fix crunch-job exit status: exit non-zero after "freeze"
Tom Clegg [Wed, 1 Oct 2014 03:49:11 +0000 (23:49 -0400)]
3775: Fix crunch-job exit status: exit non-zero after "freeze"
path (which includes task failure, INT, TERM, etc.)

Also fix wrong todo list (and therefore todo count in progress stats)
after permanent task failure.

10 years ago3899: Fix for counting complete/failed components refs #3899
Peter Amstutz [Wed, 1 Oct 2014 01:51:41 +0000 (21:51 -0400)]
3899: Fix for counting complete/failed components refs #3899

10 years ago3859: Add functional test for locking and fix tests broken by validate_state_change.
Peter Amstutz [Wed, 1 Oct 2014 01:30:56 +0000 (21:30 -0400)]
3859: Add functional test for locking and fix tests broken by validate_state_change.

10 years agoMerge branch 'master' into 3859-api-job-lock-method
Peter Amstutz [Wed, 1 Oct 2014 00:11:27 +0000 (20:11 -0400)]
Merge branch 'master' into 3859-api-job-lock-method

10 years agoMerge branch 'master' into 3859-crunch-job-use-lock
Peter Amstutz [Wed, 1 Oct 2014 00:11:13 +0000 (20:11 -0400)]
Merge branch 'master' into 3859-crunch-job-use-lock

10 years ago4000: fix copying pipeline instances with newer templates
Tim Pierce [Tue, 30 Sep 2014 22:07:15 +0000 (18:07 -0400)]
4000: fix copying pipeline instances with newer templates

* When copying script parameters from a pipeline instance, check that
  the component exists in the source instance before blindly
  dereferencing it.
* Added tests for copying when components=use_latest and when
  script=use_same (the two edge cases exposed by this bug)

10 years ago3959: crunch-job use job locking API
Peter Amstutz [Tue, 30 Sep 2014 21:10:07 +0000 (17:10 -0400)]
3959: crunch-job use job locking API

10 years ago3859: Cleaned up validate_state_change. Added unit test for job locking.
Peter Amstutz [Tue, 30 Sep 2014 20:56:52 +0000 (16:56 -0400)]
3859: Cleaned up validate_state_change.  Added unit test for job locking.

10 years ago4004: Rename "Compute status" to "Compute and job status". Added integration
Peter Amstutz [Tue, 30 Sep 2014 19:40:37 +0000 (15:40 -0400)]
4004: Rename "Compute status" to "Compute and job status".  Added integration
tests for buttons.  Reduced dashboard page rendering time by at least 25% by
batching certain API server requests (previously happing per-object),

10 years ago3782: check for Content-Range header in response
Tim Pierce [Mon, 29 Sep 2014 22:25:36 +0000 (18:25 -0400)]
3782: check for Content-Range header in response

Change the logic for detecting whether the log has been truncated to:
* response status code is 206
* a Content-Range header is present with 'bytes 0-x/y'
* x + 1 < y

Add a "download full log" link that is present when the full log is
available to be viewed.

10 years agoMerge branch '3961-uuid-assignment-not-permitted'
Tim Pierce [Tue, 30 Sep 2014 17:52:38 +0000 (13:52 -0400)]
Merge branch '3961-uuid-assignment-not-permitted'

Closes #3961.

10 years ago3961: fix FuseSharedTest
Tim Pierce [Tue, 30 Sep 2014 17:51:54 +0000 (13:51 -0400)]
3961: fix FuseSharedTest

Added new active_user collection to the FuseSharedTest.

10 years ago3052: Style tweak, iterate over j[:buf] to read streams
Peter Amstutz [Tue, 30 Sep 2014 17:08:19 +0000 (13:08 -0400)]
3052: Style tweak, iterate over j[:buf] to read streams

10 years agoMerge branch '3961-uuid-assignment-not-permitted'
Tim Pierce [Tue, 30 Sep 2014 17:01:07 +0000 (13:01 -0400)]
Merge branch '3961-uuid-assignment-not-permitted'

Closes #3961.

10 years ago3961: more explicit assertions and error text
Tim Pierce [Tue, 30 Sep 2014 16:59:40 +0000 (12:59 -0400)]
3961: more explicit assertions and error text

10 years ago3782: Isolate file_enumerator stubbing to the current test. Introduce mocha.
Tom Clegg [Tue, 30 Sep 2014 14:57:13 +0000 (10:57 -0400)]
3782: Isolate file_enumerator stubbing to the current test. Introduce mocha.

10 years ago3052: Rename variable "std" to "stream"
Peter Amstutz [Tue, 30 Sep 2014 13:44:45 +0000 (09:44 -0400)]
3052: Rename variable "std" to "stream"

10 years agoMerge branch 'master' into 3634-tab-state
Phil Hodgson [Tue, 30 Sep 2014 12:28:55 +0000 (08:28 -0400)]
Merge branch 'master' into 3634-tab-state

Conflicts:
apps/workbench/app/views/application/_content.html.erb

10 years ago3961: test creating subprojects under home with duplicate names
Tim Pierce [Tue, 30 Sep 2014 04:42:16 +0000 (00:42 -0400)]
3961: test creating subprojects under home with duplicate names

New tests:
* unprivileged user creating a subproject under their home project, with
  an existing name, returns 422
* unprivileged user creating a subproject under their home project, with
  an existing name, and ensure_unique_name=true, succeeds

10 years ago3782: keep log viewer code in _show_log.html.erb
Tim Pierce [Mon, 29 Sep 2014 21:55:17 +0000 (17:55 -0400)]
3782: keep log viewer code in _show_log.html.erb

Keep log-related restrictions in the log viewer and not in general
purpose workbench code:

* Add Rails.configuration.log_viewer_max_bytes to specify the maximum
  number of log bytes to display
* The log viewer specifies a byte limit via the HTTP Range header. The
  Content-Length of the response is set to the minimum of the 'size'
  query parameter and the byte range. If the log appears to have been
  truncated, the viewer reports it in the 'log_viewer_overview' pane.
* CollectionsController.FileStreamer either delivers the entire file
  or exactly opts[:maxbytes] bytes, whichever comes first.  It does not
  add any log-specific message.

10 years ago3052: capture stdout to log in crunch-dispatch
Peter Amstutz [Mon, 29 Sep 2014 21:11:31 +0000 (17:11 -0400)]
3052: capture stdout to log in crunch-dispatch

10 years ago3866: PySDK KeepClient accommodates services with IPv6 addresses.
Brett Smith [Mon, 29 Sep 2014 20:07:55 +0000 (16:07 -0400)]
3866: PySDK KeepClient accommodates services with IPv6 addresses.

I thought there was going to be a nicer way to construct URLs than
this, but urllib.urlunparse is still expecting the host+port as a
single string, so this approach is easier.  Closes #3866.

10 years ago3782: print log lines compatible with the log viewer
Tim Pierce [Mon, 29 Sep 2014 18:01:00 +0000 (14:01 -0400)]
3782: print log lines compatible with the log viewer

When the log is truncated, make it parsable by the log viewer regex in
addToLogViewer().

10 years agoMerge branch '3848-egg-default-git-tag-wip'
Brett Smith [Mon, 29 Sep 2014 16:28:36 +0000 (12:28 -0400)]
Merge branch '3848-egg-default-git-tag-wip'

Closes #3848, #3952.

10 years ago3848: Package version numbers use UTC timestamps.
Brett Smith [Fri, 26 Sep 2014 21:06:15 +0000 (17:06 -0400)]
3848: Package version numbers use UTC timestamps.

Per note-9 in the issue.

10 years ago3848: Python packages build with git tag by default.
Brett Smith [Mon, 22 Sep 2014 20:45:19 +0000 (16:45 -0400)]
3848: Python packages build with git tag by default.

This moves the build logic that we currently encode in Jenkins into
our setup.py, and makes it easier for developers to have versions in
sync with real users.

10 years agocloses #3889
radhika [Mon, 29 Sep 2014 15:13:50 +0000 (11:13 -0400)]
closes #3889
Merge branch '3889-functional-testing'

10 years ago3961: reset object UUID when ensure_unique_name is set
Tim Pierce [Mon, 29 Sep 2014 15:06:49 +0000 (11:06 -0400)]
3961: reset object UUID when ensure_unique_name is set

When saving an object that has to be renamed with ensure_unique_name,
force @object.uuid to nil so that validate_uuid will not be confused
into thinking we are trying to reassign the uuid.