tree 4e401a540a1226e117a5807ec60eb03128ca2f8a
parent a2c7182fa79cc94314e12850974e5bd8c12926c3
parent 27a0db8828462fc82f9e7b933c13bd0f90cf4ca4
author zheilbron <zheilbron@gmail.com> 1370401952 -0700
committer zheilbron <zheilbron@gmail.com> 1370401952 -0700

Merge branch 'master' into zheilbron/asterix_issue470

Conflicts:
	asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixAppRuntimeContext.java
	asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/transaction/TransactionContext.java
	asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/transaction/TransactionManager.java