Max Schenkelberg
71b0056d37
Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method.
...
Amend: Fixed menu mix up and making sure perspective bar is on by default
Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94
Former-commit-id: c8fcaf06d1
[formerly b91b706701
] [formerly c8fcaf06d1
[formerly b91b706701
] [formerly 1d3c378dde
[formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]]
Former-commit-id: 1d3c378dde
Former-commit-id: 69abb31ee6
[formerly e05c12e246
]
Former-commit-id: 0e64c796b1
2013-04-19 14:57:40 -05:00
Dustin Johnson
e37b5f6fc0
Issue #1914 Add email notification as a notification listener
...
Amend: Fix broken test
Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e
Former-commit-id: f3d53eb889
[formerly 74a9b93d05
] [formerly f3d53eb889
[formerly 74a9b93d05
] [formerly 067b20c684
[formerly 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377]]]
Former-commit-id: 067b20c684
Former-commit-id: 6ded48bcd8
[formerly 7b09a0e477
]
Former-commit-id: cf29290348
2013-04-18 12:57:38 -05:00
Dustin Johnson
f38e3ba430
Merge "Issue #1914 Add plugin based registry notification" into development
...
Former-commit-id: af04ecf92b
[formerly 1edba0cdc6
] [formerly af04ecf92b
[formerly 1edba0cdc6
] [formerly 67eb771ccb
[formerly 0b7539d488388f4f96af0ccf97f5651c8e7d8259]]]
Former-commit-id: 67eb771ccb
Former-commit-id: 912cc39887
[formerly 375221e524
]
Former-commit-id: 48bd9cad66
2013-04-18 11:00:57 -05:00
Benjamin Phillippe
82fbc777dc
Issue #1905 Implemented registry notifications via email
...
Change-Id: I2753074c302d707066ac0de42ac5b0778049275d
Former-commit-id: a44a4b69ff
[formerly a525a1430c
] [formerly a44a4b69ff
[formerly a525a1430c
] [formerly 7e6b8eedca
[formerly e8dba1178491176da3543a46c0d543c489b5fcb1]]]
Former-commit-id: 7e6b8eedca
Former-commit-id: f38475de7d
[formerly 9742cc996f
]
Former-commit-id: 26a762690a
2013-04-18 10:19:12 -05:00
Dustin Johnson
e589ca5e12
Issue #1914 Add plugin based registry notification
...
Change-Id: Ie450b60683e4c317ac19628cb923310b828747a7
Former-commit-id: dd190be390
[formerly 91fe9ea501
] [formerly dd190be390
[formerly 91fe9ea501
] [formerly 8989c09566
[formerly c75a5f6664b3c6d79773f4eda52ce03dfb5ba877]]]
Former-commit-id: 8989c09566
Former-commit-id: 1ea04e20e0
[formerly 0e1994a03c
]
Former-commit-id: 0bf75efca4
2013-04-17 12:17:23 -05:00
Dustin Johnson
ea37022631
Issue #1910 Add some tests of the LifecycleManager SubmitObjects functionality
...
Change-Id: Ieb1544cb52cf108836b157e3d800c470fa5cf3e1
Former-commit-id: 67e49201d6
[formerly 255aea053b
] [formerly 67e49201d6
[formerly 255aea053b
] [formerly 58b6899672
[formerly c4344f5402fe33e7e47515adc3b54913f9c13617]]]
Former-commit-id: 58b6899672
Former-commit-id: ce9f5a7365
[formerly cb899b3fa0
]
Former-commit-id: 522549fc3a
2013-04-16 11:30:06 -05:00
Dustin Johnson
ff9f489fea
Issue #1906 Remove new registry plugin from datadelivery feature
...
Change-Id: I3ca4e0335af4b7d0de195f84fe4b3ae9c6fb8598
Former-commit-id: e44d3a8715
[formerly c8241840c5
] [formerly e44d3a8715
[formerly c8241840c5
] [formerly 977702e876
[formerly 71b4bb07870f5490d89a1fe657429444c54a2689]]]
Former-commit-id: 977702e876
Former-commit-id: ee0572026a
[formerly 8170693941
]
Former-commit-id: 8095deee57
2013-04-16 10:36:56 -05:00
Dustin Johnson
493f6d3aa5
Issue #1906 Remove use of hibernate columnDefinition from SubscriptionType
...
Change-Id: I310914180865ca65290c48dc1c55f9dc11f3c044
Former-commit-id: 3e5ace2cf3
[formerly 391a7bb999
] [formerly 3e5ace2cf3
[formerly 391a7bb999
] [formerly 8b38dec4bb
[formerly 67ff37feac0998378a30c09894fab7ea0dbd84f8]]]
Former-commit-id: 8b38dec4bb
Former-commit-id: 395e4db621
[formerly 80ff75c473
]
Former-commit-id: 6302ad04b4
2013-04-16 08:08:47 -05:00
Nate Jensen
f8c3cb4589
Merge "Issue #1870 add package-info.java so that the empty src directory gets pushed to git" into development
...
Former-commit-id: 56c1fe7422
[formerly 0cbf561f7c
] [formerly 56c1fe7422
[formerly 0cbf561f7c
] [formerly d411aad285
[formerly 3d866c91c40a5addb5268c274f2cf25eef8b5fc1]]]
Former-commit-id: d411aad285
Former-commit-id: d785d3f1c2
[formerly 9d0e3fd0c2
]
Former-commit-id: 2eaf49612c
2013-04-15 14:57:03 -05:00
Matt Nash
a8358a4b40
Issue #1870 add package-info.java so that the empty src directory gets pushed to git
...
Change-Id: I75d97d6b54de65507288c1b43aaa02b143218840
Former-commit-id: 7ffb45758d
[formerly 0d12fb16bc
] [formerly 7ffb45758d
[formerly 0d12fb16bc
] [formerly 4b896002ac
[formerly df00846cfe22e318eafe40eaaa08a13b20fd5c58]]]
Former-commit-id: 4b896002ac
Former-commit-id: 317cbf0950
[formerly 87af6d2809
]
Former-commit-id: a2e421048c
2013-04-15 14:53:07 -05:00
Benjamin Phillippe
1967c632e5
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: e3f3483b51
[formerly 120906de78
] [formerly e3f3483b51
[formerly 120906de78
] [formerly ec69cdeb44
[formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]
Former-commit-id: ec69cdeb44
Former-commit-id: e5fbf006dd
[formerly c0099a8a39
]
Former-commit-id: d9b5511b8b
2013-04-12 11:27:45 -05:00
Matt Nash
63a13ef503
Issue #1871 convert parameters to Strings and make sure to return them
...
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7
Former-commit-id: 64323fc0af
[formerly cd77308fac
] [formerly 64323fc0af
[formerly cd77308fac
] [formerly 6c488cee05
[formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]
Former-commit-id: 6c488cee05
Former-commit-id: 4ee6085bda
[formerly 7dd72ab7d5
]
Former-commit-id: 6969b0c0ae
2013-04-12 09:31:23 -05:00
Matt Nash
dc0f234f02
Issue #1871 add default values for times so they don't need to be sent in from
...
Python, move getLatLonCoords()
Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1
Former-commit-id: 2ab1cf8abb
[formerly 3af61d7117
] [formerly 2ab1cf8abb
[formerly 3af61d7117
] [formerly b44ee44664
[formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]
Former-commit-id: b44ee44664
Former-commit-id: e6fc7942b8
[formerly c95e825d35
]
Former-commit-id: 7b25f73a9a
2013-04-12 09:31:16 -05:00
Matt Nash
7f52894c51
Issue #1871 make Java data access class better match Python version
...
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051
Former-commit-id: baafdafed7
[formerly 68c84fd8cc
] [formerly baafdafed7
[formerly 68c84fd8cc
] [formerly 4ac6480f52
[formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]]
Former-commit-id: 4ac6480f52
Former-commit-id: 705be14b64
[formerly 7ffd8efcf2
]
Former-commit-id: af190ad278
2013-04-12 09:31:07 -05:00
Nate Jensen
6a16f63002
Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
...
Former-commit-id: 03fac8cb06
[formerly 36ad161721
] [formerly 03fac8cb06
[formerly 36ad161721
] [formerly 8561b201d5
[formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]]
Former-commit-id: 8561b201d5
Former-commit-id: 12d4837e78
[formerly 826e64a990
]
Former-commit-id: 7c22745ac0
2013-04-12 09:30:38 -05:00
Matt Nash
b6d567fd72
Issue #1870 implement PathManager interface in Python to allow Python code to
...
get files
Change-Id: I0192c996533b1539194aaeba0213074bef8a4717
Former-commit-id: 68892951c5
[formerly bf01f50e17
] [formerly 68892951c5
[formerly bf01f50e17
] [formerly 4b23ec7c0a
[formerly e3df8efa51ad95c952318b59edca702157a59856]]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: 123351e82b
[formerly caf1f1fdf7
]
Former-commit-id: d6feca69b4
2013-04-12 07:55:56 -05:00
Max Schenkelberg
f1617ea662
Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
...
Amend: Create copy on write for PluginFactory
Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f
Former-commit-id: 1bec335fd7
[formerly 6e70b21f5f
] [formerly 1bec335fd7
[formerly 6e70b21f5f
] [formerly b695de3698
[formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]]
Former-commit-id: b695de3698
Former-commit-id: e369546b51
[formerly f2a0f8223a
]
Former-commit-id: 0b2fed1f34
2013-04-10 10:04:17 -05:00
Dustin Johnson
60e910e3d3
Issue #1826 Remove delivery/notify options for subscriptions
...
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509
Former-commit-id: f3526508f3
[formerly 11fd2d676b
] [formerly f3526508f3
[formerly 11fd2d676b
] [formerly 6bc69df127
[formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]]
Former-commit-id: 6bc69df127
Former-commit-id: 0578916ec1
[formerly b78f56f1ca
]
Former-commit-id: b61292ce4d
2013-04-09 11:40:25 -05:00
Dustin Johnson
5958178516
Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
...
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.
Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf
Former-commit-id: cef805e79a
[formerly 61346b1388
] [formerly cef805e79a
[formerly 61346b1388
] [formerly f3bdede2c8
[formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 4b4eb8e406
[formerly 8c52cd190f
]
Former-commit-id: fefc0dca3b
2013-04-05 12:41:02 -05:00
Steve Harris
a7b174bfaf
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 9879b94de9
[formerly 8b607f8228
] [formerly 9879b94de9
[formerly 8b607f8228
] [formerly 5c9a6b83cc
[formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0f53c46d7a
[formerly ed8c0487fe
]
Former-commit-id: 7eda24c3b0
2013-04-04 11:58:50 -05:00
Steve Harris
dc0baf57ba
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 2bc12f7a23
[formerly 0f000f4485
] [formerly 2bc12f7a23
[formerly 0f000f4485
] [formerly 327d05f3b5
[formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]
Former-commit-id: 327d05f3b5
Former-commit-id: 0342b648b6
[formerly c7b9690456
]
Former-commit-id: f22108c973
2013-04-03 15:52:19 -05:00
Richard Peter
75a2845464
Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
...
Former-commit-id: 920ba0628c
[formerly d282a49b6f
] [formerly 920ba0628c
[formerly d282a49b6f
] [formerly 6d73e25290
[formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]
Former-commit-id: 6d73e25290
Former-commit-id: 8ac6ae3539
[formerly 64dc5c4d23
]
Former-commit-id: 0548ee285d
2013-04-03 15:14:17 -05:00
Richard Peter
aca16ca6f9
Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
...
Former-commit-id: dd527a4ef2
[formerly cbbd9ab90d
] [formerly dd527a4ef2
[formerly cbbd9ab90d
] [formerly cfcacd20e9
[formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]
Former-commit-id: cfcacd20e9
Former-commit-id: d973d83519
[formerly 58908a0fd7
]
Former-commit-id: d2dd57fee4
2013-04-03 15:13:26 -05:00
Steve Harris
fc009792e3
13.3.1-18 baseline
...
Former-commit-id: f3e79bcc9d
[formerly a2b098d86d
] [formerly f3e79bcc9d
[formerly a2b098d86d
] [formerly ce6a06a7e3
[formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 0edd049e3b
[formerly bf6c3b6762
]
Former-commit-id: 044912d48b
2013-04-03 14:58:29 -05:00
Bryan Kowal
1aa28394c4
Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
...
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment
Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc
Former-commit-id: d1663ea98b
[formerly e788c7b471
] [formerly d1663ea98b
[formerly e788c7b471
] [formerly ee8c99ef6e
[formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: b60bea920c
[formerly 344237d9ee
]
Former-commit-id: 962755143e
2013-04-03 14:03:54 -05:00
Bryan Kowal
6ab8e23421
Issue #1661 - yajsw will now log to both the console and log file indefinitely
...
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm
Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0
Former-commit-id: ad523b9cee
[formerly 939ff752e8
] [formerly ad523b9cee
[formerly 939ff752e8
] [formerly 42ab5f4244
[formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]]
Former-commit-id: 42ab5f4244
Former-commit-id: 93cd16508c
[formerly 4fe7bace99
]
Former-commit-id: e709933a4f
2013-04-03 14:03:18 -05:00
Ron Anderson
3be7ce8bab
Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
...
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59
Former-commit-id: 34c8aad559
[formerly 3a3cdcbf46
] [formerly 34c8aad559
[formerly 3a3cdcbf46
] [formerly b703b4779e
[formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]
Former-commit-id: b703b4779e
Former-commit-id: 0d57a752dc
[formerly 065ba61389
]
Former-commit-id: 2222201f43
2013-04-03 14:01:18 -05:00
Roger Ferrel
2cad51c18f
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: f8d1a13c38
[formerly 54cbf656e9
] [formerly f8d1a13c38
[formerly 54cbf656e9
] [formerly d2aae617b2
[formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]
Former-commit-id: d2aae617b2
Former-commit-id: 2b4b10d643
[formerly 7b829a2fec
]
Former-commit-id: ad658b46bf
2013-04-03 12:48:18 -05:00
Greg Armendariz
e389a3bf6a
Issue #1782 - Restoring #1813 & #1478
...
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d
Former-commit-id: f1776b887d
[formerly e5408c3807
] [formerly f1776b887d
[formerly e5408c3807
] [formerly 54f56fde29
[formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]
Former-commit-id: 54f56fde29
Former-commit-id: e3cf306ce4
[formerly 02e79dfe8a
]
Former-commit-id: 9ca713f588
2013-04-02 15:00:26 -05:00
Nate Jensen
e0cb68cc06
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
...
Former-commit-id: ab28523a09
[formerly f57358cff8
] [formerly ab28523a09
[formerly f57358cff8
] [formerly 8f9ec8dd2c
[formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 1ad5bb1a52
[formerly 374eed35b3
]
Former-commit-id: d1f53fb57e
2013-04-02 14:29:15 -05:00
Dustin Johnson
e57b8314d8
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 48a2002e68
[formerly c981b7250f
] [formerly 48a2002e68
[formerly c981b7250f
] [formerly 6129d86be4
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: 644ed2396d
[formerly dd8f4d8454
]
Former-commit-id: 15ed8a6f58
2013-04-01 15:35:51 -05:00
Max Schenkelberg
ee60a2a80c
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: 9d032f3e84
[formerly b32fbad9c8
] [formerly 9d032f3e84
[formerly b32fbad9c8
] [formerly 547190329b
[formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: ba262e2bc5
[formerly 635388a7ad
]
Former-commit-id: 80b0f7c159
2013-04-01 12:41:50 -05:00
Steve Harris
ac6704c7e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741
[formerly 140765a43e
] [formerly 736bb45741
[formerly 140765a43e
] [formerly 437a04011a
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 7b27767d7e
[formerly 0b48e96314
]
Former-commit-id: d0e61c59e8
2013-04-01 12:19:04 -05:00
Steve Harris
e74f4ae39e
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 3b722f1076
[formerly 74a47b9bd9
] [formerly 3b722f1076
[formerly 74a47b9bd9
] [formerly 14c9de2259
[formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab
[formerly a6dd28cc82
]
Former-commit-id: 0fee31b1a8
2013-04-01 12:15:04 -05:00
Steve Harris
a112803c98
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f
[formerly 7bf9966dcb
] [formerly f28b85d42f
[formerly 7bf9966dcb
] [formerly a3fe998f8f
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7
[formerly 4afa41d4e7
]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
cc1ef45545
13.3.1-15 baseline
...
Former-commit-id: 4cf3ad6abb
[formerly eb1dab3864
] [formerly 4cf3ad6abb
[formerly eb1dab3864
] [formerly 3d8ed484be
[formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3
[formerly d3cec5d3cb
]
Former-commit-id: 4204273f21
2013-04-01 11:33:20 -05:00
Max Schenkelberg
a29eff544b
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
...
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: a508e9c8cb
[formerly 321a29ffa4
] [formerly a508e9c8cb
[formerly 321a29ffa4
] [formerly 51d976e5e2
[formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: 8de3a70962
[formerly 1c35a54a9f
]
Former-commit-id: 01c2d29c1b
2013-04-01 10:19:36 -05:00
Ron Anderson
1eede44aac
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: cfb324f380
[formerly aeb451a37c
] [formerly cfb324f380
[formerly aeb451a37c
] [formerly 679bb01764
[formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]
Former-commit-id: 679bb01764
Former-commit-id: d5e3976dc4
[formerly 96e8f63679
]
Former-commit-id: 22f633b2a1
2013-03-29 10:07:37 -05:00
Greg Armendariz
9a8ce1af9e
Fix merge issue
...
Former-commit-id: 611661ccc9
[formerly cd5da3a6c5
] [formerly 611661ccc9
[formerly cd5da3a6c5
] [formerly 5da06cadd7
[formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]
Former-commit-id: 5da06cadd7
Former-commit-id: dcd36e64a6
[formerly f0e1b80cd2
]
Former-commit-id: 57eff9d7bf
2013-03-29 09:52:46 -05:00
Greg Armendariz
63d746dd77
Change package location of import
...
Former-commit-id: f778112c20
[formerly d533c5c08d
] [formerly f778112c20
[formerly d533c5c08d
] [formerly 27345f6edf
[formerly c158a7540d23451b864a1464ab64882c3d45386d]]]
Former-commit-id: 27345f6edf
Former-commit-id: 05af592718
[formerly 089dfc87e6
]
Former-commit-id: 87e37c990e
2013-03-29 09:09:32 -05:00
David Gillingham
4c1c4e665e
Issue #1837 : Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
...
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0
Former-commit-id: 170f252bdd
[formerly 8a7c965eaa
] [formerly 170f252bdd
[formerly 8a7c965eaa
] [formerly c9ed59b0e0
[formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: fddd42615d
[formerly dbec0fa00f
]
Former-commit-id: 0b155a5788
2013-03-28 17:18:43 -05:00
Steve Harris
ef1e593ebd
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: f01b5fb849
[formerly e67dbb206e
] [formerly f01b5fb849
[formerly e67dbb206e
] [formerly 3953f8368b
[formerly 813033f4a2b30a669646b288eb00959922f0e804]]]
Former-commit-id: 3953f8368b
Former-commit-id: bec6e9099f
[formerly a74d22efc5
]
Former-commit-id: 92aa705ebc
2013-03-28 16:06:54 -05:00
Max Schenkelberg
b30b72252b
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: d55e7a0eda
[formerly e91406ab10
] [formerly d55e7a0eda
[formerly e91406ab10
] [formerly a308b27c2f
[formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]
Former-commit-id: a308b27c2f
Former-commit-id: 623c49c3cc
[formerly d9a481f542
]
Former-commit-id: 58a5bebb80
2013-03-28 15:45:31 -05:00
Ron Anderson
bef17d4f03
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 27e07ce4a9
[formerly 5bb47b7931
] [formerly 27e07ce4a9
[formerly 5bb47b7931
] [formerly b65ecfc151
[formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8
[formerly 3f2fa771d9
]
Former-commit-id: 5eb1885dbd
2013-03-28 13:37:29 -05:00
Steve Harris
938243eb0b
Revert "Replaced with formatted version"
...
This reverts commit 20c9d653c8
[formerly 054d8d263f
] [formerly e074710e0a
[formerly cf9b267283
]] [formerly 18019c07a4
] [formerly ff977fc882
[formerly b741680965
] [formerly ff977fc882
[formerly b741680965
] [formerly 18019c07a4
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]].
Former-commit-id: c51c9ea5df
[formerly 29c5918428
] [formerly c51c9ea5df
[formerly 29c5918428
] [formerly 8400028e11
[formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]
Former-commit-id: 8400028e11
Former-commit-id: 7bd478fc41
[formerly b614bf53f6
]
Former-commit-id: 0074c522bb
2013-03-28 13:08:16 -05:00
Dustin Johnson
be22a59736
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: 9bc6dd47b6
[formerly c618169639
] [formerly 9bc6dd47b6
[formerly c618169639
] [formerly 3991df64ff
[formerly 88779a4fbd8078d81139b7555525142940999558]]]
Former-commit-id: 3991df64ff
Former-commit-id: 3896cf42f1
[formerly d900459ab4
]
Former-commit-id: 9c4030ea37
2013-03-28 13:07:20 -05:00
Greg Armendariz
20c9d653c8
Replaced with formatted version
...
Former-commit-id: ff977fc882
[formerly b741680965
] [formerly ff977fc882
[formerly b741680965
] [formerly 18019c07a4
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]
Former-commit-id: 18019c07a4
Former-commit-id: e074710e0a
[formerly cf9b267283
]
Former-commit-id: 054d8d263f
2013-03-28 12:59:43 -05:00
Dustin Johnson
520b9f2a69
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: 59393b633a
[formerly 8583a5f785
] [formerly 59393b633a
[formerly 8583a5f785
] [formerly 51bf00bf1c
[formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: ee26b669e3
[formerly db5a8b9865
]
Former-commit-id: 1cf371cd41
2013-03-28 12:25:12 -05:00
Dustin Johnson
a5009cb271
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: c2edf1dd89
[formerly ab42673848
] [formerly c2edf1dd89
[formerly ab42673848
] [formerly a4e4df02b0
[formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]
Former-commit-id: a4e4df02b0
Former-commit-id: 85d6a19a5e
[formerly 902986256d
]
Former-commit-id: f135c0d948
2013-03-28 12:14:47 -05:00
Dustin Johnson
3850e46c2c
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: 5e0073f1f9
[formerly 680d2984e1
] [formerly 5e0073f1f9
[formerly 680d2984e1
] [formerly 695c83669e
[formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]
Former-commit-id: 695c83669e
Former-commit-id: d0056996cd
[formerly 25b6eb0eb9
]
Former-commit-id: fddc41bb6e
2013-03-28 12:13:23 -05:00