[Commits] [fluid-project/kettle] b07a78: Merge github.com:fluid-project/kettle

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/fluid-project/kettle

Commit: b07a783a7dd1f110e5f6295c9dcbc09cb8a64cdb
    https://github.com/fluid-project/kettle/commit/b07a783a7dd1f110e5f6295c9dcbc09cb8a64cdb
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-02-03 (Thu, 03 Feb 2011)

Log Message:
-----------
Merge github.com:fluid-project/kettle

Conflicts:
	src/main/webapp/kettle/js/kettleUtils.js
	src/main/webapp/services/kettleDemo/kettleCherryDemo.json
	src/main/webapp/services/kettleDemo/kettleJSGIDemo.json


Commit: bc842651ae2e77d1066ff7fa23a7b6a57fe00d39
    https://github.com/fluid-project/kettle/commit/bc842651ae2e77d1066ff7fa23a7b6a57fe00d39
Author: Antranig Basman <antranig.basman at colorado.edu>
Date:   2011-04-29 (Fri, 29 Apr 2011)

Changed paths:
  M src/main/webapp/application/js/EngageApp.js
  M src/main/webapp/kettle/KettleIncludes.json
  M src/main/webapp/kettle/js/kettle.js
  M src/main/webapp/services/artifactView/js/artifactView.js
  M src/main/webapp/tests/kettle/html/EngageApp-test.html
  M src/main/webapp/tests/kettle/html/Kettle-test.html
  M src/main/webapp/tests/kettle/html/KettleApp-test.html
  M src/main/webapp/tests/kettle/js/EngageAppTests.js
  M src/main/webapp/tests/kettle/js/KettleAppTests.js
  M src/main/webapp/tests/kettle/js/KettleTestUtils.js

Log Message:
-----------
KETTLE-11: Get test cases running again - drift in core framework and includes. Moved kettleCore into project from "fluid-engage-core" which is no longer tracked in git. Preparing to destroy proto-IoC definitions in favour of framework version. Some tests fail, but these areas will be destroyed anyway.


Compare: https://github.com/fluid-project/kettle/compare/79ad36c...bc84265