Dustin Johnson
f612144af5
Merge "Issue #1802 Implemented ebxml registry replication" into development
...
Former-commit-id: 7adacb156f
[formerly 20ee731e62
] [formerly 4276b4efa1
] [formerly 7adacb156f
[formerly 20ee731e62
] [formerly 4276b4efa1
] [formerly 52095664e0
[formerly 4276b4efa1
[formerly 51fea5de5df2ff5ad2169614fb6f4d64ea586c6b]]]]
Former-commit-id: 52095664e0
Former-commit-id: c4c9410c7c
[formerly 7268795739
] [formerly a00faa9243a806c03f5904839eb3dd5753530c7d [formerly fdf0f29feb
]]
Former-commit-id: 0f1cce6c8e48e5dd09a26d1bc35a69cf65027124 [formerly a66aceef23
]
Former-commit-id: e5c79edc53
2013-04-15 12:42:23 -05:00
Bryan Kowal
b36387d51a
Issue #1885 - the PostgreSQL data directory permissions will no longer be reverted to 775 during upgrades.
...
Former-commit-id: 52f1aa5fda
[formerly 0800c14061
] [formerly cca3f43736
] [formerly 52f1aa5fda
[formerly 0800c14061
] [formerly cca3f43736
] [formerly c797715efe
[formerly cca3f43736
[formerly d0fe712b37f7890c547470b24139635183ee9e1e]]]]
Former-commit-id: c797715efe
Former-commit-id: 763c9b7ca1
[formerly 8e27924557
] [formerly b54c980ffdd49821d2302b071c9aecdca092cc4e [formerly 671e600a62
]]
Former-commit-id: 0fab5d61e84d36cac7de1d7a1c9c9c43112cb824 [formerly fa59505e28
]
Former-commit-id: 7db0542069
2013-04-15 09:40:43 -05:00
Benjamin Phillippe
3733212782
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: fa6cdf46db
[formerly e3f3483b51
] [formerly 120906de78
] [formerly fa6cdf46db
[formerly e3f3483b51
] [formerly 120906de78
] [formerly ec69cdeb44
[formerly 120906de78
[formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]]
Former-commit-id: ec69cdeb44
Former-commit-id: 0a930ce83c
[formerly e5fbf006dd
] [formerly 8dba2ff501e80c05042800d7e6c73e3267e77ee2 [formerly c0099a8a39
]]
Former-commit-id: 95c16add15912c7c114c1119ff48e3bd9099e7ee [formerly d9b5511b8b
]
Former-commit-id: 1967c632e5
2013-04-12 11:27:45 -05:00
Nate Jensen
55bd1ec462
Merge "Issue #1871 convert parameters to Strings and make sure to return them" into development
...
Former-commit-id: 5d1ac53113
[formerly 00f75a3063
] [formerly e8218d0e3c
] [formerly 5d1ac53113
[formerly 00f75a3063
] [formerly e8218d0e3c
] [formerly fe163c5c16
[formerly e8218d0e3c
[formerly e9df9576305b7d58b92de6917675f8c38c020270]]]]
Former-commit-id: fe163c5c16
Former-commit-id: f9f1f8f90b
[formerly 0c1f005323
] [formerly 92e15411439e9d0363bbc5a3f47495bce0b94afc [formerly e6a24551af
]]
Former-commit-id: 3aa9e62cf9cb50220eb2e86b4a8d4101ad84d2ef [formerly 0b2851bb05
]
Former-commit-id: 3d50900ab3
2013-04-12 09:31:52 -05:00
Matt Nash
9044f422ba
Issue #1871 convert parameters to Strings and make sure to return them
...
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7
Former-commit-id: 6f12e80c0d
[formerly 64323fc0af
] [formerly cd77308fac
] [formerly 6f12e80c0d
[formerly 64323fc0af
] [formerly cd77308fac
] [formerly 6c488cee05
[formerly cd77308fac
[formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]]
Former-commit-id: 6c488cee05
Former-commit-id: 6e4cdda323
[formerly 4ee6085bda
] [formerly b7dde24ffa640c3ec2a075a60bbac138bc9b7837 [formerly 7dd72ab7d5
]]
Former-commit-id: bb7a2e01e84d6a44c089c22831f81e386f072be2 [formerly 6969b0c0ae
]
Former-commit-id: 63a13ef503
2013-04-12 09:31:23 -05:00
Matt Nash
eb17cb0e94
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: 01e9ab8a06
[formerly 2ab1cf8abb
] [formerly 3af61d7117
] [formerly 01e9ab8a06
[formerly 2ab1cf8abb
] [formerly 3af61d7117
] [formerly b44ee44664
[formerly 3af61d7117
[formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]]
Former-commit-id: b44ee44664
Former-commit-id: 6a755f6a4b
[formerly e6fc7942b8
] [formerly 2a5d354ea6b4a6308cc09c3d485c9d2ea3778f71 [formerly c95e825d35
]]
Former-commit-id: 8b3973aa378e7fd3ef3866d756662f36aa72b401 [formerly 7b25f73a9a
]
Former-commit-id: dc0f234f02
2013-04-12 09:31:16 -05:00
Matt Nash
4de612db14
Issue #1871 make Java data access class better match Python version
...
Change-Id: Ic3ab7e771add58a693420a16a349e8208852a051
Former-commit-id: 9ed1c330a6
[formerly baafdafed7
] [formerly 68c84fd8cc
] [formerly 9ed1c330a6
[formerly baafdafed7
] [formerly 68c84fd8cc
] [formerly 4ac6480f52
[formerly 68c84fd8cc
[formerly 21a59e4f9ab0e5a870b764259a1a0fc102f3b86f]]]]
Former-commit-id: 4ac6480f52
Former-commit-id: eccbf5b9aa
[formerly 705be14b64
] [formerly 1f8e933ae077261e7dc5b72f7658f41f6a5c2ec0 [formerly 7ffd8efcf2
]]
Former-commit-id: b35c0c7badac7ea42a21c3abe131663d37ff3729 [formerly af190ad278
]
Former-commit-id: 7f52894c51
2013-04-12 09:31:07 -05:00
Nate Jensen
2194f0341f
Merge "Issue #1870 implement PathManager interface in Python to allow Python code to get files" into development
...
Former-commit-id: 304be5221b
[formerly 03fac8cb06
] [formerly 36ad161721
] [formerly 304be5221b
[formerly 03fac8cb06
] [formerly 36ad161721
] [formerly 8561b201d5
[formerly 36ad161721
[formerly f4c7a9294f6218b40e582ba5e5dc8faacf52436e]]]]
Former-commit-id: 8561b201d5
Former-commit-id: 6adb90b87f
[formerly 12d4837e78
] [formerly 8cdb4eceeef8bfd82310e77ac754c36c3a8c9e20 [formerly 826e64a990
]]
Former-commit-id: 62adc7e0cacffa942ec26dadd9b3c228ff2e7383 [formerly 7c22745ac0
]
Former-commit-id: 6a16f63002
2013-04-12 09:30:38 -05:00
Matt Nash
0985877ac1
Issue #1870 implement PathManager interface in Python to allow Python code to
...
get files
Change-Id: I0192c996533b1539194aaeba0213074bef8a4717
Former-commit-id: 054c9afeed
[formerly 68892951c5
] [formerly bf01f50e17
] [formerly 054c9afeed
[formerly 68892951c5
] [formerly bf01f50e17
] [formerly 4b23ec7c0a
[formerly bf01f50e17
[formerly e3df8efa51ad95c952318b59edca702157a59856]]]]
Former-commit-id: 4b23ec7c0a
Former-commit-id: 6f32d989c4
[formerly 123351e82b
] [formerly 593118c2fd517ea4ccef855699786a9ac5386ea8 [formerly caf1f1fdf7
]]
Former-commit-id: d7376844fc5a64a79ad485ae990bc811691e6589 [formerly d6feca69b4
]
Former-commit-id: b6d567fd72
2013-04-12 07:55:56 -05:00
Dustin Johnson
2f83476702
Merge "Issue #1891 Fix sorting in pending subscription table" into development
...
Former-commit-id: 9c1ad200a7
[formerly 1aec1ca6cd
] [formerly 355e654c1e
] [formerly 9c1ad200a7
[formerly 1aec1ca6cd
] [formerly 355e654c1e
] [formerly d117a40e7c
[formerly 355e654c1e
[formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]]]
Former-commit-id: d117a40e7c
Former-commit-id: 463df28308
[formerly 9b1a6c153c
] [formerly c299f64e2bf13bd515fb4d370ba5a7f070c600b5 [formerly d149e51484
]]
Former-commit-id: 65cf3447d4cefdcd973fc6e586839b6b0f05b0ca [formerly 66136037bb
]
Former-commit-id: c72a44eb9e
2013-04-10 14:50:14 -05:00
Dustin Johnson
b4f0296480
Issue #1891 Fix sorting in pending subscription table
...
Amend: Rename getRowData() to getDisplayData()
Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa
Former-commit-id: ae7952ce64
[formerly 8b6a9551a1
] [formerly d9544f3b73
] [formerly ae7952ce64
[formerly 8b6a9551a1
] [formerly d9544f3b73
] [formerly 36cdd94a65
[formerly d9544f3b73
[formerly b37624ebadc626e3dc30f669881d0b7bb87a7c45]]]]
Former-commit-id: 36cdd94a65
Former-commit-id: 04eb46f448
[formerly a4519615ab
] [formerly 8eb6860cc948d7ca2f2c53ec73ca42b5720d269a [formerly f7505eefc2
]]
Former-commit-id: 3b64e0710fd0878f0018cd521ea4ab6074c6be15 [formerly 6ee0d474f8
]
Former-commit-id: 919fda0e8c
2013-04-10 14:04:55 -05:00
Max Schenkelberg
872981ef0a
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: cc26fc686f
[formerly 1bec335fd7
] [formerly 6e70b21f5f
] [formerly cc26fc686f
[formerly 1bec335fd7
] [formerly 6e70b21f5f
] [formerly b695de3698
[formerly 6e70b21f5f
[formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]]]
Former-commit-id: b695de3698
Former-commit-id: abb23e3ee8
[formerly e369546b51
] [formerly 816648a0ce9802fedb4f45d07b440f60e6c7efab [formerly f2a0f8223a
]]
Former-commit-id: 257a44306e905e1ce64214b821c893efbd679a91 [formerly 0b2fed1f34
]
Former-commit-id: f1617ea662
2013-04-10 10:04:17 -05:00
Dustin Johnson
ccc7e55122
Issue #1841 Update delta script for renaming PendingSubscription to PendingUserSubscription.
...
Change-Id: Ie1e485a5b8f5bce3032806fe3b0f4e78d46f93e6
Former-commit-id: 82f815752c
[formerly 7616bb80aa
] [formerly bba3563265
] [formerly 82f815752c
[formerly 7616bb80aa
] [formerly bba3563265
] [formerly ce96090763
[formerly bba3563265
[formerly d2a1704aa98f03086f7a07e416aa6aaea1d36121]]]]
Former-commit-id: ce96090763
Former-commit-id: 07176c4752
[formerly 8c5d379b72
] [formerly 833ee9cb3ec6ce81c7dd96ce6a139bd461b36928 [formerly 08a08803fe
]]
Former-commit-id: 59535a65976c57c94ee3ab2b075dd82262ebf6f8 [formerly 0857b2766c
]
Former-commit-id: 1a743b6d9a
2013-04-09 11:43:53 -05:00
Dustin Johnson
511111545c
Issue #1826 Remove delivery/notify options for subscriptions
...
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509
Former-commit-id: ba51d9a911
[formerly f3526508f3
] [formerly 11fd2d676b
] [formerly ba51d9a911
[formerly f3526508f3
] [formerly 11fd2d676b
] [formerly 6bc69df127
[formerly 11fd2d676b
[formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]]]
Former-commit-id: 6bc69df127
Former-commit-id: a93be0ad07
[formerly 0578916ec1
] [formerly 481cf7d3351795f1186b2ad2e6947bdd0e75d0ee [formerly b78f56f1ca
]]
Former-commit-id: 01d40a67a07f6599feaec5703ba0f20d1c79f019 [formerly b61292ce4d
]
Former-commit-id: 60e910e3d3
2013-04-09 11:40:25 -05:00
Dustin Johnson
e7301e95c9
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: 3a6d9209df
[formerly cef805e79a
] [formerly 61346b1388
] [formerly 3a6d9209df
[formerly cef805e79a
] [formerly 61346b1388
] [formerly f3bdede2c8
[formerly 61346b1388
[formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 73a8bb7a02
[formerly 4b4eb8e406
] [formerly da2f137f6b51f8ac36c0d76f597f0c82e1dfd829 [formerly 8c52cd190f
]]
Former-commit-id: 58e02dc2dcf3d6a21fbf5672b90de97e43258d5e [formerly fefc0dca3b
]
Former-commit-id: 5958178516
2013-04-05 12:41:02 -05:00
Bryan Kowal
4accd3bbd4
Issue #1805 - restore the full nightly delta build.
...
Former-commit-id: 8474243360
[formerly 1ebf50c7ed
] [formerly 52be309cac
] [formerly 8474243360
[formerly 1ebf50c7ed
] [formerly 52be309cac
] [formerly dc522ede44
[formerly 52be309cac
[formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]]]
Former-commit-id: dc522ede44
Former-commit-id: a5d79669d7
[formerly 607d5b205d
] [formerly 13548041df738803ecba4e04334e549a9ebb19c1 [formerly 04e22df174
]]
Former-commit-id: 852a30c2e05f970b0eae175c1839c9b30ceb4c96 [formerly c97dccb62d
]
Former-commit-id: ce1f23692e
2013-04-04 16:16:53 -05:00
Greg Armendariz
db25658b91
Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development
...
Former-commit-id: 88a6a8abb3
[formerly 6e0ced27dc
] [formerly d6d0e0131f
] [formerly 88a6a8abb3
[formerly 6e0ced27dc
] [formerly d6d0e0131f
] [formerly 71d400e09f
[formerly d6d0e0131f
[formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]]]
Former-commit-id: 71d400e09f
Former-commit-id: f0957645ad
[formerly f452a4582a
] [formerly db325a9270fe94f678cb6b219d0d78c03ac26ba9 [formerly d463555ca3
]]
Former-commit-id: b0131e66fc88dcb445eae8dd32ed7994f087f4ff [formerly d176c441e7
]
Former-commit-id: df0146764b
2013-04-04 13:00:39 -05:00
Bryan Kowal
a800e56338
Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
...
Former-commit-id: c5afa1883b
[formerly 70c8ed6bc0
] [formerly 3fac666de5
] [formerly c5afa1883b
[formerly 70c8ed6bc0
] [formerly 3fac666de5
] [formerly 64c54f2110
[formerly 3fac666de5
[formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]]
Former-commit-id: 64c54f2110
Former-commit-id: b4e684ad08
[formerly 6a66158097
] [formerly 7caf86fef7ce3f92cf05af51e41bb90a5b3fbdaa [formerly 49ee55327d
]]
Former-commit-id: 6265c9153ffe44beeb85c5aaa0594d99ddd97281 [formerly dda6a904ed
]
Former-commit-id: cc94b29199
2013-04-04 12:48:59 -05:00
Steve Harris
1eecca8712
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: d331abc911
[formerly 8b5b1d286b
] [formerly 56410d2a04
] [formerly d331abc911
[formerly 8b5b1d286b
] [formerly 56410d2a04
] [formerly 731ed52cd6
[formerly 56410d2a04
[formerly 6e7c89a07a4105097de3ffa1b7522fdae93baa5b]]]]
Former-commit-id: 731ed52cd6
Former-commit-id: 4fc654dbf8
[formerly a400879732
] [formerly fb00ce04ea7245e82984ca609d784ae6847ef288 [formerly a419f72b2d
]]
Former-commit-id: f80b5c05205c86cfee4d05bc11deb705b7e60e88 [formerly 7c3bfa901b
]
Former-commit-id: 2dad0ec07e
2013-04-04 12:01:23 -05:00
Steve Harris
084125dd3c
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 4dfea33cdd
[formerly 9879b94de9
] [formerly 8b607f8228
] [formerly 4dfea33cdd
[formerly 9879b94de9
] [formerly 8b607f8228
] [formerly 5c9a6b83cc
[formerly 8b607f8228
[formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: bbfc0f76ef
[formerly 0f53c46d7a
] [formerly 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe
]]
Former-commit-id: 55bdcb43db4e6090118e9aec0586c1a76860abe3 [formerly 7eda24c3b0
]
Former-commit-id: a7b174bfaf
2013-04-04 11:58:50 -05:00
Steve Harris
370fe32515
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
...
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: 55655fdab9
[formerly 3487a41532
] [formerly ea34b1db1e
] [formerly 55655fdab9
[formerly 3487a41532
] [formerly ea34b1db1e
] [formerly d98a119f4d
[formerly ea34b1db1e
[formerly 735ce03302b54116c8545daf043585fb16fabd11]]]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a2b88cd38
[formerly 3ea89862c0
] [formerly 81f4469f3483d2aa0d3f210a9122ae238b69e5a7 [formerly 1a91fd82ff
]]
Former-commit-id: ce9119cdd89f24a126f2689d183e0b09c5572365 [formerly f0918ec8ad
]
Former-commit-id: e0eda90af4
2013-04-04 11:12:22 -05:00
Bryan Kowal
d60c0c39e1
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: a8fe170b53
[formerly c448651065
] [formerly 03a2e82b77
] [formerly a8fe170b53
[formerly c448651065
] [formerly 03a2e82b77
] [formerly 8d3c98eb5d
[formerly 03a2e82b77
[formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 64dbc18c8e
[formerly 12e9b9d75b
] [formerly fab6d44468dbf0db3894a28e8b00ea49184bb43e [formerly 5816ddaf77
]]
Former-commit-id: e7f0a63952036826712c60267aeae594c52d3e3f [formerly bd47c62789
]
Former-commit-id: 6032a8dd0c
2013-04-03 18:27:10 -05:00
Nate Jensen
0a621e8228
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
...
Former-commit-id: 59f084426c
[formerly f43ac8bbc3
] [formerly 79a9d76915
] [formerly 59f084426c
[formerly f43ac8bbc3
] [formerly 79a9d76915
] [formerly 73d86e8926
[formerly 79a9d76915
[formerly eaabe1a4935051d003ed302de193cfb183118845]]]]
Former-commit-id: 73d86e8926
Former-commit-id: 91c6521d10
[formerly e74f83d83a
] [formerly 641d60c190b7ce188d34ee3d8a2f74fb6d1a5e54 [formerly c87d157cbd
]]
Former-commit-id: be0db364e2a34349e3d14bb371f5ee4450866b7c [formerly 5be8ef079e
]
Former-commit-id: b151421989
2013-04-03 17:28:49 -05:00
Steve Harris
dd878fe749
13.2.1-21 baseline
...
Former-commit-id: 50106822ea
[formerly a86d44584d
] [formerly d4358b93dc
] [formerly 50106822ea
[formerly a86d44584d
] [formerly d4358b93dc
] [formerly 33bd359cfe
[formerly d4358b93dc
[formerly f80eddbb15e5ca1710c15d245957345d6f840546]]]]
Former-commit-id: 33bd359cfe
Former-commit-id: 688327d314
[formerly 5c029bc4ac
] [formerly 09e2a7d813b8cb62d46bd89be26006f9864a8721 [formerly 18d6fa4f4d
]]
Former-commit-id: 61f40969380e40cdb0eb63774bda339712e25d4e [formerly eb5258f043
]
Former-commit-id: 3d1d0a6a9c
2013-04-03 18:08:41 -04:00
Steve Harris
54f2f2b94a
13.2.1-20 baseline
...
Former-commit-id: 3aa43b1b0d
[formerly ad663b925c
] [formerly 6a55bc5dff
] [formerly 3aa43b1b0d
[formerly ad663b925c
] [formerly 6a55bc5dff
] [formerly 539faf0a71
[formerly 6a55bc5dff
[formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]]]
Former-commit-id: 539faf0a71
Former-commit-id: 3be498b2fc
[formerly b062373048
] [formerly 7dca551d593dd1f6e0032c2e45684997afece6da [formerly 12d4316b3a
]]
Former-commit-id: f95250cfa48810db80f1dd3b8097e0dca13d4fad [formerly 9c51f2d15f
]
Former-commit-id: fbddfb5a25
2013-04-03 18:05:39 -04:00
Steve Harris
114eec390d
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 77c0dd0b55
[formerly 2bc12f7a23
] [formerly 0f000f4485
] [formerly 77c0dd0b55
[formerly 2bc12f7a23
] [formerly 0f000f4485
] [formerly 327d05f3b5
[formerly 0f000f4485
[formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]]
Former-commit-id: 327d05f3b5
Former-commit-id: b2de6fd4c1
[formerly 0342b648b6
] [formerly 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456
]]
Former-commit-id: cbf659d2aeb98a7a61aa0b89fa053b8445f63a9f [formerly f22108c973
]
Former-commit-id: dc0baf57ba
2013-04-03 15:52:19 -05:00
Ron Anderson
6ed11bbc88
Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
...
Former-commit-id: 492587b91c
[formerly b880af3c48
] [formerly de856db77a
] [formerly 492587b91c
[formerly b880af3c48
] [formerly de856db77a
] [formerly c82968c1e6
[formerly de856db77a
[formerly 53ace4843058424627c3b670caa77972ddbe01be]]]]
Former-commit-id: c82968c1e6
Former-commit-id: 0acc778948
[formerly a633b96fdf
] [formerly d6c6f95496edc22dcabb64db1fe0138d9b9dfabb [formerly 237e414b5d
]]
Former-commit-id: 6cff15f012d66863326f0d8789adfac29026769c [formerly fb76bf6d49
]
Former-commit-id: e5252cf3a4
2013-04-03 15:25:52 -05:00
Richard Peter
f03594dc87
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: 7d2b8a7576
[formerly 920ba0628c
] [formerly d282a49b6f
] [formerly 7d2b8a7576
[formerly 920ba0628c
] [formerly d282a49b6f
] [formerly 6d73e25290
[formerly d282a49b6f
[formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]]
Former-commit-id: 6d73e25290
Former-commit-id: dcc6ca7202
[formerly 8ac6ae3539
] [formerly dc7cbd6d3f910f10adee39b3fe760360f1e82888 [formerly 64dc5c4d23
]]
Former-commit-id: 54bea0b83fc5bd1c3cc475f07d09468710cce778 [formerly 0548ee285d
]
Former-commit-id: 75a2845464
2013-04-03 15:14:17 -05:00
Richard Peter
3215738fd4
Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
...
Former-commit-id: f0450ff6f2
[formerly dd527a4ef2
] [formerly cbbd9ab90d
] [formerly f0450ff6f2
[formerly dd527a4ef2
] [formerly cbbd9ab90d
] [formerly cfcacd20e9
[formerly cbbd9ab90d
[formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]]
Former-commit-id: cfcacd20e9
Former-commit-id: bddc4b1bdf
[formerly d973d83519
] [formerly a8e4b972144335b974c48d4fadd8845f75b550f0 [formerly 58908a0fd7
]]
Former-commit-id: 3332bf3bb5bf9062085e62fc233a2fd0b8b7dbdc [formerly d2dd57fee4
]
Former-commit-id: aca16ca6f9
2013-04-03 15:13:26 -05:00
Steve Harris
0cd73a41a1
13.3.1-18 baseline
...
Former-commit-id: e621424fcb
[formerly f3e79bcc9d
] [formerly a2b098d86d
] [formerly e621424fcb
[formerly f3e79bcc9d
] [formerly a2b098d86d
] [formerly ce6a06a7e3
[formerly a2b098d86d
[formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b
[formerly 0edd049e3b
] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762
]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b
]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Nate Jensen
cf069478fe
Issue #1855 fix python threading in GFE procedures and smart tools
...
Change-Id: I6420338991c1961ce63ff944b516925f83a12994
Former-commit-id: 52e83d902b
[formerly 5c830c3c9c
] [formerly e3462292ab
] [formerly 52e83d902b
[formerly 5c830c3c9c
] [formerly e3462292ab
] [formerly fe24e34163
[formerly e3462292ab
[formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]]
Former-commit-id: fe24e34163
Former-commit-id: 62eb52e295
[formerly 1c6643e7de
] [formerly 27fc586eb36f76446b7be74d68ec2819f9554038 [formerly e18e798a94
]]
Former-commit-id: a757d160b2e5635526d0c3f28efa98d91764c0cf [formerly 01b25904ad
]
Former-commit-id: f0abb60a1b
2013-04-03 14:33:24 -05:00
Lee Venable
13754c533c
Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
...
Former-commit-id: bd785bf5a4
[formerly c8549e67d6
] [formerly 40b8ecf27d
] [formerly bd785bf5a4
[formerly c8549e67d6
] [formerly 40b8ecf27d
] [formerly ff910d99fc
[formerly 40b8ecf27d
[formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]]
Former-commit-id: ff910d99fc
Former-commit-id: 49fc55ce03
[formerly 3d129d4526
] [formerly dc127c10f9c848a58411f7df06f86982131e3a2d [formerly 36a15b3be1
]]
Former-commit-id: cd7a6b03494efcd71e21fc5a0f3ae6206fdcaa20 [formerly 5b0fb8eeaf
]
Former-commit-id: 542dfcaf9b
2013-04-03 14:14:41 -05:00
Nate Jensen
5a88c9820b
Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
...
Former-commit-id: 3334d9b065
[formerly a109ec4601
] [formerly dbbad421db
] [formerly 3334d9b065
[formerly a109ec4601
] [formerly dbbad421db
] [formerly 1bc148b468
[formerly dbbad421db
[formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]]
Former-commit-id: 1bc148b468
Former-commit-id: 0a783718a9
[formerly 2d4dc636ce
] [formerly 61a33575090f1b95703ee5ebf2af09b0f2f1fa1c [formerly ec8cdfd8f0
]]
Former-commit-id: 2c852a36d92e9ace1a3bf68a94b1ecc96bc27b30 [formerly ab51de7da5
]
Former-commit-id: 2c6e995faf
2013-04-03 14:13:14 -05:00
Nate Jensen
fc40cab9bc
Issue #1562 max's fix for topo with custom colormaps
...
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e
Former-commit-id: 869f5498f6
[formerly d64e0a2a39
] [formerly 057a929903
] [formerly 869f5498f6
[formerly d64e0a2a39
] [formerly 057a929903
] [formerly 6c711f037c
[formerly 057a929903
[formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]]
Former-commit-id: 6c711f037c
Former-commit-id: 10b70e4222
[formerly 6ca17c5a2a
] [formerly a8d505a73fefb71d965eb0d0a4c7619632647528 [formerly 616612e550
]]
Former-commit-id: 084203f5ffb0d6a7d8de687bcc1a6caa6ffeaf43 [formerly fb5bce6afe
]
Former-commit-id: 0e25d15232
2013-04-03 14:10:53 -05:00
Bryan Kowal
aab5a08bdb
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: 981638c532
[formerly d1663ea98b
] [formerly e788c7b471
] [formerly 981638c532
[formerly d1663ea98b
] [formerly e788c7b471
] [formerly ee8c99ef6e
[formerly e788c7b471
[formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: ea6a9687f7
[formerly b60bea920c
] [formerly 75de255c33338b2c6a36abb8a97bd7559baa6968 [formerly 344237d9ee
]]
Former-commit-id: a0d42e4f89e75d56e4c9f0549bc21f3da3691e6b [formerly 962755143e
]
Former-commit-id: 1aa28394c4
2013-04-03 14:03:54 -05:00
Bryan Kowal
d62b0d3d5f
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: 2dbabffbe5
[formerly ad523b9cee
] [formerly 939ff752e8
] [formerly 2dbabffbe5
[formerly ad523b9cee
] [formerly 939ff752e8
] [formerly 42ab5f4244
[formerly 939ff752e8
[formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]]]
Former-commit-id: 42ab5f4244
Former-commit-id: e618c4833f
[formerly 93cd16508c
] [formerly 95d11ada8c00865cd2e0c7fefde5e05c93de384a [formerly 4fe7bace99
]]
Former-commit-id: 0c7c37575eec14f586dc5a62f5d1c1ee24b0f946 [formerly e709933a4f
]
Former-commit-id: 6ab8e23421
2013-04-03 14:03:18 -05:00
Ron Anderson
8a2c181df6
Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
...
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59
Former-commit-id: 3e61a80508
[formerly 34c8aad559
] [formerly 3a3cdcbf46
] [formerly 3e61a80508
[formerly 34c8aad559
] [formerly 3a3cdcbf46
] [formerly b703b4779e
[formerly 3a3cdcbf46
[formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]]
Former-commit-id: b703b4779e
Former-commit-id: a0c34f1750
[formerly 0d57a752dc
] [formerly 2ed70c94d4f1788d709469642bb3b7a34fdeef14 [formerly 065ba61389
]]
Former-commit-id: f6906d6c665fe19cb44286fdb8ff6ebb5d58db5c [formerly 2222201f43
]
Former-commit-id: 3be7ce8bab
2013-04-03 14:01:18 -05:00
Roger Ferrel
89be749f8d
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: e87e4c869d
[formerly f8d1a13c38
] [formerly 54cbf656e9
] [formerly e87e4c869d
[formerly f8d1a13c38
] [formerly 54cbf656e9
] [formerly d2aae617b2
[formerly 54cbf656e9
[formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]]
Former-commit-id: d2aae617b2
Former-commit-id: 3248f4bcf2
[formerly 2b4b10d643
] [formerly 116b58dfaee7c620e2aea5a1b9ca83d6a22be2db [formerly 7b829a2fec
]]
Former-commit-id: 718544292ebcdbe6476ea274620a8961444112e5 [formerly ad658b46bf
]
Former-commit-id: 2cad51c18f
2013-04-03 12:48:18 -05:00
Jonathan Sanchez
7a7a1b7ea0
Issue #1858 Handled creating a follow up when initial was created before
...
0z but issued after.
Former-commit-id: 262f280821
[formerly 9b547cab98
] [formerly 9c322bf4b7
] [formerly 262f280821
[formerly 9b547cab98
] [formerly 9c322bf4b7
] [formerly 799b8c57ef
[formerly 9c322bf4b7
[formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]]]
Former-commit-id: 799b8c57ef
Former-commit-id: 689334d2e1
[formerly 7ca110890a
] [formerly a8114ff352a146cacee317eae56977b042f8cda5 [formerly bd25782b7a
]]
Former-commit-id: 3b57f5d0ff98ca49da8472e1ed3b12ed2f12464a [formerly 30a728e641
]
Former-commit-id: 6f25295c90
2013-04-03 11:43:59 -05:00
Ben Steffensmeier
9239e64c15
Issue #1824 Fix Tile Geometry creation.
...
Former-commit-id: f8db56c0af
[formerly fe561d7af0
] [formerly fedbc28588
] [formerly f8db56c0af
[formerly fe561d7af0
] [formerly fedbc28588
] [formerly cfcc33cd7b
[formerly fedbc28588
[formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]]]
Former-commit-id: cfcc33cd7b
Former-commit-id: f2915807a0
[formerly e0bbe368be
] [formerly a47a6ce1413348a47ef24247df2a0ba67f2fd485 [formerly 58d81f6556
]]
Former-commit-id: 1173cfa28f3150dd6e87469f3aeb1b25a52af127 [formerly 15be152be1
]
Former-commit-id: eb98e23be1
2013-04-03 10:59:11 -05:00
Lee Venable
a32d254419
Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1
...
Former-commit-id: 15c707ac50
[formerly 48433d4d37
] [formerly 0693b02556
] [formerly 15c707ac50
[formerly 48433d4d37
] [formerly 0693b02556
] [formerly 7bdf9c3115
[formerly 0693b02556
[formerly 321f2a9f7b8c204937a8685b402b0f90db13f321]]]]
Former-commit-id: 7bdf9c3115
Former-commit-id: 503ac4a1c9
[formerly f254b070eb
] [formerly f86e075331dbbcb0667795e2fcb2530476ddf632 [formerly ea85582347
]]
Former-commit-id: dce2e4ef996aa9a742e585d2999d2f662f5cf493 [formerly 2912d66b16
]
Former-commit-id: d5a12212d9
2013-04-02 17:46:48 -05:00
Mike Duff
0f8a831c01
Issue #1731 - fix problem with dmd updating.
...
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6
Former-commit-id: 335b85ea48
[formerly c3ab8259d5
] [formerly 64cdb3c7fd
] [formerly 335b85ea48
[formerly c3ab8259d5
] [formerly 64cdb3c7fd
] [formerly 23c8085402
[formerly 64cdb3c7fd
[formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]]
Former-commit-id: 23c8085402
Former-commit-id: a932186e2f
[formerly bb14757eed
] [formerly ca721abdd76f0ab8bfb9d6237b043b5674132b84 [formerly 3f2f0937ce
]]
Former-commit-id: dbd807a7829dd50e060600aa69920cc72d69167b [formerly 5298fb6633
]
Former-commit-id: aef1bc779f
2013-04-02 16:22:23 -05:00
Greg Armendariz
2b710f3540
Issue #1782 - Restoring #1813 & #1478
...
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d
Former-commit-id: b8e7d3644c
[formerly f1776b887d
] [formerly e5408c3807
] [formerly b8e7d3644c
[formerly f1776b887d
] [formerly e5408c3807
] [formerly 54f56fde29
[formerly e5408c3807
[formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]]
Former-commit-id: 54f56fde29
Former-commit-id: 2bfe8fccfd
[formerly e3cf306ce4
] [formerly d64b8f0c79380e97b0125bf494b7ba124b119a98 [formerly 02e79dfe8a
]]
Former-commit-id: 3273e25181a10873df7356911fe3ccbe0a321fe3 [formerly 9ca713f588
]
Former-commit-id: e389a3bf6a
2013-04-02 15:00:26 -05:00
Nate Jensen
b65824a812
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
...
Former-commit-id: cb6cd91f06
[formerly ab28523a09
] [formerly f57358cff8
] [formerly cb6cd91f06
[formerly ab28523a09
] [formerly f57358cff8
] [formerly 8f9ec8dd2c
[formerly f57358cff8
[formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: c82a67f378
[formerly 1ad5bb1a52
] [formerly 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3
]]
Former-commit-id: da64965f81585567559fad5d0cd0833628607d59 [formerly d1f53fb57e
]
Former-commit-id: e0cb68cc06
2013-04-02 14:29:15 -05:00
Bryan Kowal
a3a009e375
Issue #1850 - the ebxml schema will now be created within the metadata database
...
Former-commit-id: 3d13334576
[formerly d6e3d52126
] [formerly 8d63244b4e
] [formerly 3d13334576
[formerly d6e3d52126
] [formerly 8d63244b4e
] [formerly 2dbd62e9ce
[formerly 8d63244b4e
[formerly 0e7bcb156a4958639f38c83ae1d0e2f55398cb94]]]]
Former-commit-id: 2dbd62e9ce
Former-commit-id: 55b84c59c6
[formerly a57a457c79
] [formerly 57767b7c64c0b9fe7114780c1b2b46960afdf9dc [formerly b31ade0770
]]
Former-commit-id: 5d201beef6e4982516bfefcc6ee6d05a26d22162 [formerly 94b0191843
]
Former-commit-id: 3f9bcfe936
2013-04-02 10:49:46 -05:00
Dustin Johnson
b6c2c0194c
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: 5b7fcb1ce2
[formerly 48a2002e68
] [formerly c981b7250f
] [formerly 5b7fcb1ce2
[formerly 48a2002e68
] [formerly c981b7250f
] [formerly 6129d86be4
[formerly c981b7250f
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]]
Former-commit-id: 6129d86be4
Former-commit-id: c42ca22867
[formerly 644ed2396d
] [formerly e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454
]]
Former-commit-id: 4466a4fe3eec25da0716798d2d3f9beb6bb0d4f0 [formerly 15ed8a6f58
]
Former-commit-id: e57b8314d8
2013-04-01 15:35:51 -05:00
Max Schenkelberg
bb8e2cf3e1
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: a59484e232
[formerly 9d032f3e84
] [formerly b32fbad9c8
] [formerly a59484e232
[formerly 9d032f3e84
] [formerly b32fbad9c8
] [formerly 547190329b
[formerly b32fbad9c8
[formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]]
Former-commit-id: 547190329b
Former-commit-id: 984e67acda
[formerly ba262e2bc5
] [formerly a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad
]]
Former-commit-id: 27d68b81294fdcff628db2407a3b0b00c4165e1d [formerly 80b0f7c159
]
Former-commit-id: ee60a2a80c
2013-04-01 12:41:50 -05:00
Lee Venable
e77b20af5d
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: 6109daf744
[formerly e994040887
] [formerly 4a8c4b64df
] [formerly 6109daf744
[formerly e994040887
] [formerly 4a8c4b64df
] [formerly f1e8faf9ff
[formerly 4a8c4b64df
[formerly 9c117d43e77ffa074c8464771918116f8835b382]]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 7e4696f582
[formerly 58c83b9662
] [formerly 80217d8bb653fed512ec88e601b9cf14286e1708 [formerly 35d27f89f1
]]
Former-commit-id: 6cebcfee43829f43dceb8e066a3d5bfe306d66e1 [formerly e66a72fbed
]
Former-commit-id: ca38aca6df
2013-04-01 12:26:23 -05:00
Steve Harris
6a3f6359d6
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: 5ec1c01d3a
[formerly 736bb45741
] [formerly 140765a43e
] [formerly 5ec1c01d3a
[formerly 736bb45741
] [formerly 140765a43e
] [formerly 437a04011a
[formerly 140765a43e
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]
Former-commit-id: 437a04011a
Former-commit-id: 47c7f66f2b
[formerly 7b27767d7e
] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314
]]
Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8
]
Former-commit-id: ac6704c7e9
2013-04-01 12:19:04 -05:00
Steve Harris
4dc4b40b9f
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: d2d9195925
[formerly 3b722f1076
] [formerly 74a47b9bd9
] [formerly d2d9195925
[formerly 3b722f1076
] [formerly 74a47b9bd9
] [formerly 14c9de2259
[formerly 74a47b9bd9
[formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea
[formerly f85a1ab9ab
] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82
]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8
]
Former-commit-id: e74f4ae39e
2013-04-01 12:15:04 -05:00