[saga-project/BigJob] 79c847: re-created AL's EC2 fixes in develop-prod

[Ole Weidner]

Branch: refs/heads/feature/getworkingdir
Home: https://github.com/saga-project/BigJob
Commit: 79c8474cab26fd44570c1fa45e160505f3fba939
https://github.com/saga-project/BigJob/commit/79c8474cab26fd44570c1fa45e160505f3fba939
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M bigjob/bigjob_manager.py
M bigjob/job_plugin/ec2ssh.py
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
re-created AL's EC2 fixes in develop-prod


Commit: 07112e6b57e66cbb1dd9a41c794c9931c9bbb5d0
https://github.com/saga-project/BigJob/commit/07112e6b57e66cbb1dd9a41c794c9931c9bbb5d0
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M setup.py

Log Message:
-----------
sigh...


Commit: ec9a3ce9e83c27b1e560c177cc395c0a39f835c5
https://github.com/saga-project/BigJob/commit/ec9a3ce9e83c27b1e560c177cc395c0a39f835c5
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M MANIFEST.in

Log Message:
-----------
added VERSION


Commit: 7d78e2c537c62a674ac758fdbbf1174611570a4c
https://github.com/saga-project/BigJob/commit/7d78e2c537c62a674ac758fdbbf1174611570a4c
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths:
M bigjob/bigjob_manager.py
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
fixed Anajni's problem


Commit: a8fc7fa2c69617cb3e0ab52956e32003377963c0
https://github.com/saga-project/BigJob/commit/a8fc7fa2c69617cb3e0ab52956e32003377963c0
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths:
M README.md
M bigjob.conf
M bigjob/bigjob_agent.py
M bigjob/bigjob_manager.py
M bigjob/job_plugin/ec2ssh.py
M coordination/bigjob_coordination_redis.py
M examples/pilot-api/example-pilot-api.py
M pilot/impl/pilot_manager_decentral.py
M pilot/impl/pilotcompute_manager.py
M setup.py
M tests/performance/throughput.py

Log Message:
-----------
Merge branch 'master' into develop-prod

Conflicts:
bigjob/bigjob_manager.py
bigjob/job_plugin/ec2ssh.py
pilot/impl/pilotcompute_manager.py


Commit: 170d108edb93ee9934ce780b927b0d47ab7fa71a
https://github.com/saga-project/BigJob/commit/170d108edb93ee9934ce780b927b0d47ab7fa71a
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths:
M bigjob/job_plugin/ec2ssh.py

Log Message:
-----------
accidentally commited unmerged conflict


Commit: ae05edbc0e737b42e85f1d5a27d7a9f31a18b1bb
https://github.com/saga-project/BigJob/commit/ae05edbc0e737b42e85f1d5a27d7a9f31a18b1bb
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths:
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
another missed conflict :/


Commit: 52505a209fc80bc0bbab4a5d3055a29b6c5280f9
https://github.com/saga-project/BigJob/commit/52505a209fc80bc0bbab4a5d3055a29b6c5280f9
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-12 (Mon, 12 Aug 2013)

Changed paths:
M pilot/impl/pilotcompute_manager.py

Log Message:
-----------
re-added a method that was lost in action


Commit: f254f4cd45599ce243576c7dffefbaf228dc7820
https://github.com/saga-project/BigJob/commit/f254f4cd45599ce243576c7dffefbaf228dc7820
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-14 (Wed, 14 Aug 2013)

Changed paths:
M bigjob/bigjob_manager.py

Log Message:
-----------
another attempt to fix the working_directory issue


Commit: fc0c8f2c5fcfd8233a258b61f888efa8504ae32e
https://github.com/saga-project/BigJob/commit/fc0c8f2c5fcfd8233a258b61f888efa8504ae32e
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-24 (Sat, 24 Aug 2013)

Changed paths:
M pilot/filemanagement/ssh_adaptor.py
M pilot/impl/pilot_manager_decentral.py
M pilot/impl/pilotcompute_manager.py
M pilot/impl/pilotdata_manager.py

Log Message:
-----------
Merge branch 'master' into feature/getworkingdir


Commit: 663e1fd2f163c27bd6d70ea8047d7f32d3159541
https://github.com/saga-project/BigJob/commit/663e1fd2f163c27bd6d70ea8047d7f32d3159541
Author: Ole Weidner <ole.w...@rutgers.edu>
Date: 2013-08-24 (Sat, 24 Aug 2013)

Changed paths:
M setup.py

Log Message:
-----------
reverting to 'BigJob'


Compare: https://github.com/saga-project/BigJob/compare/b2c1f542339c...663e1fd2f163

To unsubscribe from these emails, change your notification settings at https://github.com/saga-project/BigJob/settings/notifications