GitHub PushEvent at 2014-05-01 03:27:04
Repository: COMS362
Actor: jdmielke
Payload: {"shas":[["2bd320c3fb7395ae462a58b69029dd8b6aea6d17","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","Merge pull request #7 from aguibert/master\n\nUpdate with Andy's PR","Lucas Rohret",true],["4ba9188a234698411b8fe33519feb3f3dad2bd0f","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","Merge branch 'master' of https://github.com/lrohret/COMS362\n\nConflicts:\n\tShippingSystem/config.properties\n\tShippingSystem/src/system/truck/TruckImpl.java\n\tShippingSystem/src/system/truck/TruckManagerImpl.java","Lucas Rohret",true],["478511018821c25805c16998824c51197115c5a2","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","MOre","Lucas Rohret",true],["623ad99e61df7a8211259560d86267e6a7cf99a6","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","Merge branch 'master' of https://github.com/lrohret/COMS362\n\nConflicts:\n\tShippingSystem/config.properties\n\tShippingSystem/src/system/truck/TruckManagerImpl.java","Lucas Rohret",true],["94a2834322fe17ad9237eedc116dd39af95a0343","80769e5ee8f8c887938ac9b4feb225260e442244@gmail.com","I2: Customer marks package damaged","aguibert",true],["06d6915eddc930269725d2c5967ff243122331b0","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","Finished Iteration 1 Truck","Lucas Rohret",true],["0024009d04c108952a156e4bf5ea2c3330225962","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","Merge pull request #8 from aguibert/master\n\nI2: Customer marks package damaged","Lucas Rohret",true],["28239eecfe456eb8ba018a85fe477b68303eec75","85da9abdfafbbe379c2c3abb4484357c3e73f213@gmail.com","Fixed probs brah IT1 TTTTTruck","Lucas Rohret",true],["a83883867864549ac89911b50885883a5930c090","a3798eb59bc2c21615eea5d481b16f2e1932382e@users.noreply.github.com","Merge pull request #5 from lrohret/master\n\nFinished Iteration 1 for Truck","aguibert",true],["cee5412d7f99adfa08dd86c02a94ad6f5e5cee8e","80769e5ee8f8c887938ac9b4feb225260e442244@gmail.com","Iteration 2 use cases","aguibert",true],["403164beb4d5ee5f62f902ee0807b7ae61d7622c","a29925bbafa303e3f02d845f5edc7a084e40186b@iastate.edu","Merge pull request #12 from aguibert/master\n\nI2 stuff","jdmielke",true]],"size":11,"ref":"refs/heads/master","head":"403164beb4d5ee5f62f902ee0807b7ae61d7622c"}