[jhclark/ducttape] 9bc342: Merge branch 'master' of www:/repos/git/Workflow/d...

[Lane Schwartz]

Branch: refs/heads/master
Home: https://github.com/jhclark/ducttape
Commit: 9bc3420778aa0b7a5ea5c35b00d4553e0245aa82
https://github.com/jhclark/ducttape/commit/9bc3420778aa0b7a5ea5c35b00d4553e0245aa82
Author: Lane Schwartz <dowo...@gmail.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)

Changed paths:
M .travis.yml
M Makefile.dist
M README.md
M ROADMAP.md
M build-support/dist.sh
M build-support/jar.sh
A build-support/proguard.sh
M src/main/scala/ducttape.scala
A src/main/scala/ducttape/cli/Directives.scala
M src/main/scala/ducttape/cli/ExecuteMode.scala
M src/main/scala/ducttape/cli/Plans.scala
M src/main/scala/ducttape/exec/DirectoryArchitect.scala
M src/main/scala/ducttape/exec/LockManager.scala
M src/main/scala/ducttape/exec/Submitter.scala
M src/main/scala/ducttape/hyperdag/walker/UnpackedDagWalker.scala
M src/main/scala/ducttape/syntax/AbstractSyntaxTree.scala
M src/main/scala/ducttape/syntax/Grammar.scala
M src/main/scala/ducttape/syntax/GrammarParser.scala
M src/main/scala/ducttape/syntax/WorkflowChecker.scala
M src/main/scala/ducttape/util/Environment.scala
M src/main/scala/ducttape/util/Files.scala
M src/main/scala/ducttape/util/LogUtils.scala
M src/main/scala/ducttape/versioner/WorkflowVersionInfo.scala
M src/main/scala/ducttape/workflow/BuiltInLoader.scala
M src/main/scala/ducttape/workflow/builder/WorkflowBuilder.scala
M src/test/scala/ducttape/syntax/BlocksTest.scala
M tutorial/01-04-dependencies.tape
R tutorial/01-06-config-anonymous.tape
A tutorial/01-06-config-anonymous.tape.DEPRECATED
R tutorial/01-07-config-named.tape
A tutorial/01-07-config-named.tape.DEPRECATED
M tutorial/01-08-config-extern.conf
M tutorial/01-08-config-extern.tape
M tutorial/01-09-globals.tape
M tutorial/02-03-git.tape
M tutorial/03-02-one-off.tape
M tutorial/03-06-branch-grafting.tape
M tutorial/03-08-nested-branch-points.tape
M tutorial/06-02-sge-simple.tape
M tutorial/10-02-faq.md
M tutorial/TUTORIAL.md
A version.info

Log Message:
-----------
Merge branch 'master' of www:/repos/git/Workflow/ducttape


Commit: d16a53be8c674c6fc18f689dd632d028b3301218
https://github.com/jhclark/ducttape/commit/d16a53be8c674c6fc18f689dd632d028b3301218
Author: Lane Schwartz <dowo...@gmail.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)

Changed paths:
M logging.properties
M src/main/scala/ducttape.scala
M src/main/scala/ducttape/cli/ColorUtils.scala
M src/main/scala/ducttape/cli/Config.scala
M src/main/scala/ducttape/cli/EnvironmentMode.scala
M src/main/scala/ducttape/cli/ErrorUtils.scala
M src/main/scala/ducttape/cli/ExecuteMode.scala
M src/main/scala/ducttape/cli/Opts.scala
M src/main/scala/ducttape/cli/Plans.scala
M src/main/scala/ducttape/syntax/Grammar.scala
M src/main/scala/ducttape/syntax/WorkflowChecker.scala

Log Message:
-----------
Merge branch 'master' of www:/repos/git/Workflow/ducttape


Commit: da504bd763fc5da41749cdb5ad9da5024b18f85a
https://github.com/jhclark/ducttape/commit/da504bd763fc5da41749cdb5ad9da5024b18f85a
Author: Lane Schwartz <dowo...@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Changed paths:
M build-support/build.sh
M build-support/eclipse_jar.sh
M src/main/scala/ducttape.scala
M src/main/scala/ducttape/syntax/AbstractSyntaxTree.scala
M src/main/scala/ducttape/syntax/Grammar.scala
M src/main/scala/ducttape/syntax/StaticChecker.scala
M src/main/scala/ducttape/util/Environment.scala
M src/main/scala/ducttape/workflow/builder/TaskTemplateBuilder.scala
M src/test/scala/ducttape/syntax/BlockTest.scala
M src/test/scala/ducttape/syntax/CrossProductTest.scala
M src/test/scala/ducttape/syntax/PlanTest.scala
A webui/eyecandy/assets/css/bootstrap-responsive.css
A webui/eyecandy/assets/css/bootstrap.css
A webui/eyecandy/assets/css/docs.css
A webui/eyecandy/assets/font-awesome/font-awesome.css
A webui/eyecandy/assets/font-awesome/fontawesome-webfont.eot
A webui/eyecandy/assets/font-awesome/fontawesome-webfont.svg
A webui/eyecandy/assets/font-awesome/fontawesome-webfont.ttf
A webui/eyecandy/assets/font-awesome/fontawesome-webfont.woff
A webui/eyecandy/assets/ico/apple-touch-icon-114-precomposed.png
A webui/eyecandy/assets/ico/apple-touch-icon-144-precomposed.png
A webui/eyecandy/assets/ico/apple-touch-icon-57-precomposed.png
A webui/eyecandy/assets/ico/apple-touch-icon-72-precomposed.png
A webui/eyecandy/assets/ico/favicon.ico
A webui/eyecandy/assets/img/bird.png
A webui/eyecandy/assets/img/bootstrap-mdo-sfmoma-01.jpg
A webui/eyecandy/assets/img/bootstrap-mdo-sfmoma-02.jpg
A webui/eyecandy/assets/img/bootstrap-mdo-sfmoma-03.jpg
A webui/eyecandy/assets/img/browsers.png
A webui/eyecandy/assets/img/example-sites/fleetio.png
A webui/eyecandy/assets/img/example-sites/jshint.png
A webui/eyecandy/assets/img/example-sites/kippt.png
A webui/eyecandy/assets/img/example-sites/soundready.png
A webui/eyecandy/assets/img/examples/bootstrap-example-fluid.jpg
A webui/eyecandy/assets/img/examples/bootstrap-example-hero.jpg
A webui/eyecandy/assets/img/examples/bootstrap-example-starter.jpg
A webui/eyecandy/assets/img/github-16px.png
A webui/eyecandy/assets/img/glyphicons-halflings-white.png
A webui/eyecandy/assets/img/glyphicons-halflings.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_009_magic.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_042_group.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_079_podium.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_082_roundabout.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_155_show_thumbnails.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_163_iphone.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_214_resize_small.png
A webui/eyecandy/assets/img/glyphicons/glyphicons_266_book_open.png
A webui/eyecandy/assets/img/grid-18px-masked.png
A webui/eyecandy/assets/img/icon-css3.png
A webui/eyecandy/assets/img/icon-github.png
A webui/eyecandy/assets/img/icon-html5.png
A webui/eyecandy/assets/img/icon-twitter.png
A webui/eyecandy/assets/img/less-logo-large.png
A webui/eyecandy/assets/img/less-small.png
A webui/eyecandy/assets/img/responsive-illustrations.png
A webui/eyecandy/assets/js/README.md
A webui/eyecandy/assets/js/application.js
A webui/eyecandy/assets/js/bootstrap-alert.js
A webui/eyecandy/assets/js/bootstrap-button.js
A webui/eyecandy/assets/js/bootstrap-carousel.js
A webui/eyecandy/assets/js/bootstrap-collapse.js
A webui/eyecandy/assets/js/bootstrap-dropdown.js
A webui/eyecandy/assets/js/bootstrap-modal.js
A webui/eyecandy/assets/js/bootstrap-popover.js
A webui/eyecandy/assets/js/bootstrap-scrollspy.js
A webui/eyecandy/assets/js/bootstrap-tab.js
A webui/eyecandy/assets/js/bootstrap-tooltip.js
A webui/eyecandy/assets/js/bootstrap-transition.js
A webui/eyecandy/assets/js/bootstrap-typeahead.js
A webui/eyecandy/assets/js/bootstrap.js
A webui/eyecandy/assets/js/bootstrap.min.js
A webui/eyecandy/assets/js/google-code-prettify/prettify.css
A webui/eyecandy/assets/js/google-code-prettify/prettify.js
A webui/eyecandy/assets/js/jquery.js
A webui/eyecandy/ducttape.css
A webui/eyecandy/out.pdf
A webui/eyecandy/webui.html

Log Message:
-----------
Merge branch 'master' of www:/repos/git/Workflow/ducttape


Commit: da12404a74d2dec6eba9f53164234ea10b0d8bb4
https://github.com/jhclark/ducttape/commit/da12404a74d2dec6eba9f53164234ea10b0d8bb4
Author: Lane Schwartz <dowo...@gmail.com>
Date: 2013-11-06 (Wed, 06 Nov 2013)

Changed paths:
M .classpath
M .gitignore
M .settings/org.scala-ide.sdt.core.prefs
M .travis.yml
A CHANGELOG.md
M HACKING.md
M Makefile.dist
M README.md
M ROADMAP.md
M build-support/build.sh
M build-support/dist.sh
M build-support/doc.sh
A build-support/full_build_server_test.sh
R build-support/jar.sh
A build-support/proguard-4.8.jar
A build-support/proguard.ini
R build-support/proguard.sh
R build-support/sbt
R build-support/sbt-launch.jar
M build-support/test-regression.sh
M build-support/test-unit.sh
R build.sbt
M builtins/git.tape
A builtins/pbs.tape
M ducttape
A examples/cdec_tutorial/tutorial.tape
A examples/cdec_tutorial/tutorial.tconf
A examples/cdec_tutorial/weights.init
A lib/grizzled-slf4j_2.10-1.0.1.jar
R lib/grizzled-slf4j_2.9.1-1-0.6.8.jar
R lib/scala-optparse-1.1.jar
A lib/scala-optparse_2.10-1.1.1.jar
A lib/scala/scala-library-2.10.0.jar
R lib/scala/scala-library-2.9.2.jar
R lib/slf4j-api-1.6.4.jar
A lib/slf4j-api-1.7.2.jar
R lib/slf4j-jdk14-1.6.4.jar
A lib/slf4j-jdk14-1.7.2.jar
R lib/test/scalatest-1.7.1.jar
A lib/test/scalatest_2.10.0-2.0.M5.jar
M logging.properties
R project/plugins.sbt
M src/main/scala/ducttape.scala
M src/main/scala/ducttape/cli/ColorUtils.scala
M src/main/scala/ducttape/cli/Config.scala
M src/main/scala/ducttape/cli/Directives.scala
M src/main/scala/ducttape/cli/EnvironmentMode.scala
M src/main/scala/ducttape/cli/ErrorUtils.scala
M src/main/scala/ducttape/cli/ExecuteMode.scala
M src/main/scala/ducttape/cli/Opts.scala
M src/main/scala/ducttape/cli/Plans.scala
M src/main/scala/ducttape/cli/RealizationGlob.scala
M src/main/scala/ducttape/exec/BuildEnvironment.scala
M src/main/scala/ducttape/exec/CompletionChecker.scala
M src/main/scala/ducttape/exec/DirectoryArchitect.scala
M src/main/scala/ducttape/exec/ExecutionObserver.scala
M src/main/scala/ducttape/exec/Executor.scala
M src/main/scala/ducttape/exec/ForceUnlocker.scala
M src/main/scala/ducttape/exec/InputChecker.scala
M src/main/scala/ducttape/exec/LockManager.scala
M src/main/scala/ducttape/exec/PackageBuilder.scala
M src/main/scala/ducttape/exec/PackageFinder.scala
M src/main/scala/ducttape/exec/PackageVersioner.scala
M src/main/scala/ducttape/exec/PartialOutputMover.scala
M src/main/scala/ducttape/exec/PidWriter.scala
M src/main/scala/ducttape/exec/Submitter.scala
M src/main/scala/ducttape/exec/TaskEnvironment.scala
M src/main/scala/ducttape/exec/UnpackedDagVisitor.scala
M src/main/scala/ducttape/hyperdag/HyperDag.scala
M src/main/scala/ducttape/hyperdag/HyperDagBuilder.scala
M src/main/scala/ducttape/hyperdag/HyperEdge.scala
M src/main/scala/ducttape/hyperdag/PackedVertex.scala
M src/main/scala/ducttape/hyperdag/PhantomHyperDag.scala
M src/main/scala/ducttape/hyperdag/UnpackedVertex.scala
M src/main/scala/ducttape/hyperdag/meta/MetaEdge.scala
M src/main/scala/ducttape/hyperdag/meta/MetaHyperDag.scala
M src/main/scala/ducttape/hyperdag/meta/MetaHyperDagBuilder.scala
M src/main/scala/ducttape/hyperdag/meta/PhantomMetaHyperDag.scala
M src/main/scala/ducttape/hyperdag/meta/PhantomMetaHyperDagBuilder.scala
M src/main/scala/ducttape/hyperdag/meta/UnpackedChainedMetaVertex.scala
M src/main/scala/ducttape/hyperdag/meta/UnpackedMetaVertex.scala
A src/main/scala/ducttape/hyperdag/walker/Traversal.scala
M src/main/scala/ducttape/hyperdag/walker/UnpackedDagWalker.scala
M src/main/scala/ducttape/hyperdag/walker/UnpackedMetaDagWalker.scala
M src/main/scala/ducttape/hyperdag/walker/UnpackedPhantomMetaDagWalker.scala
M src/main/scala/ducttape/hyperdag/walker/unpackfilters.scala
M src/main/scala/ducttape/syntax/AbstractSyntaxTree.scala
M src/main/scala/ducttape/syntax/Grammar.scala
M src/main/scala/ducttape/syntax/GrammarParser.scala
A src/main/scala/ducttape/syntax/Namespace.scala
M src/main/scala/ducttape/syntax/StaticChecker.scala
M src/main/scala/ducttape/syntax/WorkflowChecker.scala
M src/main/scala/ducttape/syntax/bash.scala
A src/main/scala/ducttape/util/Booleans.scala
M src/main/scala/ducttape/util/Files.scala
A src/main/scala/ducttape/util/GlobValuesMap.scala
M src/main/scala/ducttape/util/HashUtils.scala
M src/main/scala/ducttape/util/Shell.scala
A src/main/scala/ducttape/util/Strings.scala
A src/main/scala/ducttape/versioner/VersionedPackageId.scala
M src/main/scala/ducttape/versioner/WorkflowVersionHistory.scala
M src/main/scala/ducttape/versioner/WorkflowVersionInfo.scala
A src/main/scala/ducttape/versioner/WorkflowVersionStore.scala
M src/main/scala/ducttape/viz/WorkflowViz.scala
M src/main/scala/ducttape/workflow/Branch.scala
M src/main/scala/ducttape/workflow/BranchFactory.scala
M src/main/scala/ducttape/workflow/HyperWorkflow.scala
M src/main/scala/ducttape/workflow/InPlanConstraint.scala
M src/main/scala/ducttape/workflow/RealTask.scala
A src/main/scala/ducttape/workflow/RealTaskId.scala
M src/main/scala/ducttape/workflow/Realization.scala
M src/main/scala/ducttape/workflow/RealizationPlan.scala
M src/main/scala/ducttape/workflow/TaskTemplate.scala
M src/main/scala/ducttape/workflow/Types.scala
A src/main/scala/ducttape/workflow/VersionedTask.scala
A src/main/scala/ducttape/workflow/VersionedTaskId.scala
M src/main/scala/ducttape/workflow/Visitors.scala
A src/main/scala/ducttape/workflow/builder/BranchGraftGlob.scala
A src/main/scala/ducttape/workflow/builder/BranchPointHandler.scala
A src/main/scala/ducttape/workflow/builder/BranchPointTree.scala
A src/main/scala/ducttape/workflow/builder/BranchPointTreeGrafts.scala
A src/main/scala/ducttape/workflow/builder/BranchTree.scala
M src/main/scala/ducttape/workflow/builder/FoundTasks.scala
A src/main/scala/ducttape/workflow/builder/ResolveMode.scala
A src/main/scala/ducttape/workflow/builder/SourceSpecInfo.scala
A src/main/scala/ducttape/workflow/builder/State.scala
M src/main/scala/ducttape/workflow/builder/TaskTemplateBuilder.scala
A src/main/scala/ducttape/workflow/builder/TerminalData.scala
A src/main/scala/ducttape/workflow/builder/VariableHandler.scala
M src/main/scala/ducttape/workflow/builder/WorkflowBuilder.scala
M src/main/scala/ducttape/workflow/spectypes.scala
M src/test/scala/ducttape/hyperdag/PackedVertexTest.scala
M src/test/scala/ducttape/hyperdag/walker/UnpackedDagWalkerTest.scala
M src/test/scala/ducttape/syntax/BashCodeTest.scala
A src/test/scala/ducttape/syntax/ImportTest.scala
A src/test/scala/ducttape/workflow/builder/BranchGraftGlobTest.scala
A syntax/issues/shouldSucceed/140.tape
A syntax/issues/shouldSucceed/145.tape
A tabular
A tech-report/Makefile
A tech-report/report.bib
A tech-report/report.tex
M test.xml
A tutorial/02-03-git.sh
M tutorial/05-01-hello-summaries.tape.TODO
M tutorial/07-01-groups.tape.TODO
A tutorial/07-02-functions.tape
M tutorial/07-02-functions.tape.TODO
M tutorial/TUTORIAL.md
M version.info

Log Message:
-----------
Merge branch 'master' of www:/repos/git/Workflow/ducttape


Commit: 9ca0d44e51499403d4198a5198de81787db1104f
https://github.com/jhclark/ducttape/commit/9ca0d44e51499403d4198a5198de81787db1104f
Author: Lane Schwartz <dowo...@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)

Changed paths:
M Makefile.dist
M README.md

Log Message:
-----------
Merge branch 'master' of www:/repos/git/Workflow/ducttape


Commit: d68eaddb25a4cbebcdc6c483a8847e5f879987e4
https://github.com/jhclark/ducttape/commit/d68eaddb25a4cbebcdc6c483a8847e5f879987e4
Author: Lane Schwartz <dowo...@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)

Changed paths:
A tutorial/03-07-branch-globbing.tape.BROKEN

Log Message:
-----------
Check in example that breaks branch globs


Compare: https://github.com/jhclark/ducttape/compare/1d3fb830e5ed...d68eaddb25a4