DataTorrent/Malhar — pull request #216 by nickholub (2013-10-28 06:13:39+00:00)
Title: Squashed commit of the following:

commit 534dd735d0e6e6168f487fb3e98bffab52f14465
Author: Andy Perlitch
Date: Sun Oct 27 22:08:23 2013 -0700

Using slightly older transactions when generating a anamolous transaction.

commit 7ae79adb5809e016429f0ff125dd2149810d52fc
Author: Andy Perlitch
Date: Sun Oct 27 22:07:31 2013 -0700

Changes using smaller amounts.

commit 6ff5407e29419a07fe2044f257ee178ecfe94e53
Merge: 4d79bc8 084d994
Author: Andy Perlitch
Date: Sun Oct 27 21:11:02 2013 -0700

Merge branch 'machineapp_andy' of github.com:nickholub/Malhar into machineapp_andy

commit 084d99413fcba9254ae869353f48bdc20ecfecfe
Author: Andy Perlitch
Date: Sun Oct 27 21:10:11 2013 -0700

updated amounts for fraud demo

commit d02a64033d539a1efced30994921a156a4bf15bb
Merge: 2bdb738 1448264
Author: Andy Perlitch
Date: Sun Oct 27 21:02:51 2013 -0700

Merge branch 'machineapp' of github.com:nickholub/Malhar into machineapp

Conflicts:
webapps/app/scripts/controllers/machine.js

commit 4d79bc89ac6edb1b03ad6293a61aa38bf92b3dbe
Merge: 0d03c85 1448264
Author: Andy Perlitch
Date: Sun Oct 27 16:28:30 2013 -0700

Merge branch 'machineapp' of github.com:nickholub/Malhar into machineapp

commit 1448264452d54664ee5856e31ad4a18a93ae7cb9
Author: nickholub
Date: Sat Oct 26 22:10:44 2013 -0700

#213 Machine Web Apps - Dimensions URL

commit af31d72968def9f010ed61367f6f86e4f9dbede0
Author: nickholub
Date: Sat Oct 26 21:49:41 2013 -0700

#212 Machine Web App - Reload Button

commit 82de1db04077212f2af89ca4134bb0f9a8da817a
Author: nickholub
Date: Sat Oct 26 21:36:42 2013 -0700

#213 Machine Web Apps - Dimensions URL

commit ac31e75a0546db7a2503067ce2a21d46586bf314
Author: nickholub
Date: Sat Oct 26 17:30:34 2013 -0700

#212 Machine Web App - Reload Button

commit 0d03c850f717b19444af39c51f08914e37ed0a1d
Merge: dcfae9c 72cd0d8
Author: nickholub
Date: Fri Oct 25 20:53:23 2013 -0700

Merge pull request #211 from nickholub/apps_fraud2

Fraud App Rename

commit 72cd0d84e1f3e46c034bdee6236d8f14b0c0cde4
Author: nickholub
Date: Fri Oct 25 20:51:20 2013 -0700

fraud app renamed

commit 2bdb738fca07220fe6bef72d259e7cded34ac51c
Author: Andy Perlitch
Date: Fri Oct 25 19:55:07 2013 -0700

added underscore to package.json

commit 9fde6d9975ebb589b48e7850e5e8c7cf90b16577
Author: Andy Perlitch
Date: Fri Oct 25 19:52:14 2013 -0700

updated app name for fraud

commit 77a6a453b83c8ed1af4b1fcc61983d81713e40e5
Author: Andy Perlitch
Date: Fri Oct 25 19:46:47 2013 -0700

added in lost changes to fraud

commit 5d55fd2d130b12bc45491f87771855ef10a3da20
Author: nickholub
Date: Fri Oct 25 19:29:37 2013 -0700

fix #208 Web Apps - Elapsed Time

commit 75f2b48804eb1fc8d07fece0881f1bc10ea219f1
Author: nickholub
Date: Fri Oct 25 18:01:44 2013 -0700

fix #208 Web Apps - Elapsed Time

commit fe52cb1c85f60c7ff41576c548d9daf30cd12c3c
Author: nickholub
Date: Fri Oct 25 17:52:41 2013 -0700

fix #208 Web Apps - Elapsed Time

commit b39a298434a02ca262e3b7ce3775abbf8b4ab9e9
Author: nickholub
Date: Fri Oct 25 17:45:30 2013 -0700

fix #208 Web Apps - Elapsed Time