xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5408 commits 31 branches 40 tags 3.8 GiB
Commit graph

5408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roger Ferrel
17fe559a70 Issue #2879 Code clean up. 
Former-commit-id: 4a306121bd [formerly dd09032119] [formerly 4a306121bd [formerly dd09032119] [formerly f6fe26d3de [formerly 6fbb95beec25582f577dc3547f8f3424eb92cdf2]]]
Former-commit-id: f6fe26d3de
Former-commit-id: ba38afeeb9 [formerly 867d85e17d]
Former-commit-id: d44c677b5a
 2014-03-27 16:17:02 -05:00
Roger Ferrel
c907b28a02 Issue #2879 Loading case no longer changes start/end time. 
Former-commit-id: 6e2d462052 [formerly 2f9c62bd0c] [formerly 6e2d462052 [formerly 2f9c62bd0c] [formerly b78a05658d [formerly 60275732b2abcecf671a8338c8f87334baad3702]]]
Former-commit-id: b78a05658d
Former-commit-id: 394e8fcbcf [formerly 16ade55cb6]
Former-commit-id: 9c1dc3c8ab
 2014-03-27 15:52:31 -05:00
Ben Steffensmeier
7e0fc8bda5 Issue #2791 Fix streamlines that were broken in conversion to data source. 
Former-commit-id: 4289b416c0 [formerly b4c30292f8] [formerly 4289b416c0 [formerly b4c30292f8] [formerly 3c6fa3bfc8 [formerly 644ceb3fb7a4f01f74a0259043b23e4d01ce16c0]]]
Former-commit-id: 3c6fa3bfc8
Former-commit-id: 83d17a138e [formerly 2589749b76]
Former-commit-id: f7ecee99ff
 2014-03-27 15:09:00 -05:00
Roger Ferrel
fef551ba78 Issue #2790 Detect problems caused by simultaneous running of purge. 
Former-commit-id: ae2cb792a1 [formerly ad5d6428a6] [formerly ae2cb792a1 [formerly ad5d6428a6] [formerly f012ac179d [formerly 882cf75a4b9a5773def3dc9f167d2c441883789f]]]
Former-commit-id: f012ac179d
Former-commit-id: b9e1dd70a9 [formerly 8b24d06488]
Former-commit-id: 111415e9f5
 2014-03-27 14:42:09 -05:00
Ron Anderson
93d29b05a9 Merge "Issue #2664 Added support for non-WGS84 shape files" into development 
Former-commit-id: a97734c786 [formerly 21e3eeca05] [formerly a97734c786 [formerly 21e3eeca05] [formerly 86c0fe78f2 [formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 374f012e85 [formerly c318aa6547]
Former-commit-id: 8eb249f866
 2014-03-27 14:35:34 -05:00
David Friedman
8f8f55dd3c Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
 2014-03-27 19:17:03 +00:00
Ron Anderson
b92df6757a Issue #2664 Added support for non-WGS84 shape files 
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: c9e456983b [formerly 1b39ed7771] [formerly c9e456983b [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: 527399107f [formerly 65d4400471]
Former-commit-id: 8f6c261d0d
 2014-03-27 13:04:44 -05:00
Slav Korolev
6efb1f4f5c Issue #2811 - Added check for empty message. Updated logger. 
Former-commit-id: 24895b9308 [formerly 9ac8a7a2f3] [formerly 24895b9308 [formerly 9ac8a7a2f3] [formerly 982735561c [formerly e0010578785dd88861e8c9ef229e3e6452a5bd0e]]]
Former-commit-id: 982735561c
Former-commit-id: 0b04fb80e3 [formerly b5fb10a84d]
Former-commit-id: 08be3d0f45
 2014-03-27 10:54:41 -04:00
Bryan Kowal
a64288b37d Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development 
Former-commit-id: 5b563bf870 [formerly e0d15b8e29] [formerly 5b563bf870 [formerly e0d15b8e29] [formerly faa7604827 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]
Former-commit-id: faa7604827
Former-commit-id: 5ce208ec73 [formerly 7d68836b88]
Former-commit-id: 01a7d32bc1
 2014-03-27 09:25:14 -05:00
Brian.Dyke
102414db3a Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: a1b980a15d [formerly 6346c9776b] [formerly a1b980a15d [formerly 6346c9776b] [formerly 3b639347f8 [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 519ec3071a [formerly 76625c2238]
Former-commit-id: 9fa73765f9
 2014-03-27 10:22:26 -04:00
Steve Harris
d9af02b1d2 Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development 
Former-commit-id: 29f4f53d27 [formerly a70710b467] [formerly 29f4f53d27 [formerly a70710b467] [formerly 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]
Former-commit-id: 656ae897c1
Former-commit-id: b99ed0cce6 [formerly b1d31f21bc]
Former-commit-id: 2d6dde4ac6
 2014-03-26 16:19:26 -05:00
Steve Harris
76def67552 Merge branch 'master_14.2.2' into omaha_14.2.2 
Former-commit-id: d940427408 [formerly 53f91fdeea] [formerly d940427408 [formerly 53f91fdeea] [formerly e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 9d4f24da7b [formerly 1b9ebbddcc]
Former-commit-id: 7a7a9cc18e
 2014-03-26 16:13:59 -05:00
Nate Jensen
75c45b23f9 Merge "Issue #2905 fixed types, added scale/offset in bufr parser" into development 
Former-commit-id: 5a035c3730 [formerly c97c56c182] [formerly 5a035c3730 [formerly c97c56c182] [formerly cf0afc8e57 [formerly d324fc13d63bbd8edb780512fdce49b1e7c15a92]]]
Former-commit-id: cf0afc8e57
Former-commit-id: c783b80d8e [formerly 59fe50e847]
Former-commit-id: 7b54be41b6
 2014-03-26 16:12:16 -05:00
Steve Harris
ef058152a0 Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1 
Former-commit-id: 9cf3600ff6 [formerly 4879520391] [formerly 9cf3600ff6 [formerly 4879520391] [formerly a7efde7cf4 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 311c8d67af [formerly 55440888fd]
Former-commit-id: af32adebc5
 2014-03-26 15:51:32 -05:00
Lee Venable
0c6f0a1c36 Merge "Issue #2930 - Fixed error in distance." into development 
Former-commit-id: a03c5a4922 [formerly 7ab1ce0f90] [formerly a03c5a4922 [formerly 7ab1ce0f90] [formerly c0bd44bca8 [formerly e924e378e2f0572f2ee02b23fee61e725f34ce93]]]
Former-commit-id: c0bd44bca8
Former-commit-id: 70a0e968d3 [formerly 1225edafba]
Former-commit-id: 16cef3e8ae
 2014-03-26 15:50:14 -05:00
Brian Clements
d1f3144e7b Issue #2905 fixed types, added scale/offset in bufr parser 
parser now does the following for each data value:
1) promote unsigned values to next larger type
2) replace with null if value equals missing value
3) apply scale factor and addition offset
to do this, the netcdf variable for each structure member was needed
this required walking the variable list along with the struct iterator


Former-commit-id: 52a7443a6c [formerly 82cee15739] [formerly 52a7443a6c [formerly 82cee15739] [formerly 3e5a5774c4 [formerly dee6d1d1bd169854109f0921ca0c23bc212d2df9]]]
Former-commit-id: 3e5a5774c4
Former-commit-id: 796305a348 [formerly e3020dbe8f]
Former-commit-id: 38cc44f20a
 2014-03-26 15:20:16 -05:00
Bryan Kowal
6dc3ae2214 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts 
Former-commit-id: 911c0a99c9 [formerly a554dc8c20] [formerly 911c0a99c9 [formerly a554dc8c20] [formerly 286051cbb9 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]
Former-commit-id: 286051cbb9
Former-commit-id: f0f10e2544 [formerly 6b28f08242]
Former-commit-id: f5c1cf750b
 2014-03-26 14:57:46 -05:00
Richard Peter
3b21d80e86 Merge "Issue #2905 added translation tables for BUFR" into development 
Former-commit-id: 51485f9a74 [formerly a47ad6a51d] [formerly 51485f9a74 [formerly a47ad6a51d] [formerly cf494e3290 [formerly 6bc42a9fd38373b4ba8cdbc9a8091eee8b867acd]]]
Former-commit-id: cf494e3290
Former-commit-id: 89680c26a0 [formerly 9e193a27eb]
Former-commit-id: 2be893ab5d
 2014-03-26 14:47:58 -05:00
Brian Clements
2169cffb74 Issue #2905 added translation tables for BUFR 
added current WMO BUFR code/flag XML table file
created parser that can read the WMO XML
created JAXB files for BUFR translation XML files
created utility to generate translation tables for specific BUFR tables


Former-commit-id: f4ac2d117e [formerly 6d3d459a90] [formerly f4ac2d117e [formerly 6d3d459a90] [formerly d9eb75280d [formerly 2634afede20af4ab6d059ef6dbd1af093184f90a]]]
Former-commit-id: d9eb75280d
Former-commit-id: 1bfbe099ea [formerly a153775c32]
Former-commit-id: 77b66da899
 2014-03-26 14:34:41 -05:00
Slav Korolev
e4db649080 Issue #2930 - Fixed error in distance. 
Former-commit-id: b197408019 [formerly c0688f9e99] [formerly b197408019 [formerly c0688f9e99] [formerly 9b9d7f8f4e [formerly c56753c19f8413e1094b524a9bc43bbcfc74e46f]]]
Former-commit-id: 9b9d7f8f4e
Former-commit-id: 154206a2cb [formerly 77803ef6b6]
Former-commit-id: c3a213890e
 2014-03-26 10:48:38 -04:00
Bryan Kowal
ccff1985f9 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development 
Former-commit-id: 3f06c30135 [formerly 386e85fce9] [formerly 3f06c30135 [formerly 386e85fce9] [formerly 6df224e171 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]
Former-commit-id: 6df224e171
Former-commit-id: d8b088392b [formerly 70fdc03a5c]
Former-commit-id: 7a451cd404
 2014-03-26 09:19:05 -05:00
Brian.Dyke
e7aea77979 Fixed comment merge conflicts added .gitignore 
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
 2014-03-25 15:41:58 -04:00
Ron Anderson
d843d14130 Merge "Issue #2874 Initial implementation of RTOFS data." into development 
Former-commit-id: c8b2da72ee [formerly 1cad7c8ea7] [formerly c8b2da72ee [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]
Former-commit-id: fdbb505679
Former-commit-id: b154755f33 [formerly bbbf19c72e]
Former-commit-id: e7e9cf1e36
 2014-03-25 13:20:02 -05:00
Richard Peter
f8765902f3 Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development 
Former-commit-id: c37a55b552 [formerly 3e2f280091] [formerly c37a55b552 [formerly 3e2f280091] [formerly 3221310454 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]
Former-commit-id: 3221310454
Former-commit-id: 457e51a4ee [formerly 6ebd2444ef]
Former-commit-id: 4a3238b071
 2014-03-25 13:11:36 -05:00
Nate Jensen
a36bdb3b99 Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development 
Former-commit-id: c7dc0baeb9 [formerly 38e3305e60] [formerly c7dc0baeb9 [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 307cdc15c1 [formerly 7c581cb5d7]
Former-commit-id: 015dc45eba
 2014-03-25 13:11:29 -05:00
Bryan Kowal
6a9e1fec9c Issue #2851 - 64-bit gridslice library for Windows 
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 065e1dac5e [formerly 37a6b85483] [formerly 065e1dac5e [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 687a060d44c88723de7f775925536adb9f71a257]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 77601dbb9f [formerly dcaac3d61d]
Former-commit-id: 95f181f95f
 2014-03-25 13:03:44 -05:00
Brian.Dyke
2ba9b8825b OB_14.1.1-25 baseline 
Former-commit-id: c085bc6879 [formerly c67833407c] [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 95ada25b65 [formerly 36fdf6bfe4]
Former-commit-id: 05ab17425c
 2014-03-25 13:55:54 -04:00
Mike Duff
a86684f034 Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text 
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b

Former-commit-id: 1eefb7be44 [formerly 0bfdcdcbe0] [formerly 1eefb7be44 [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]
Former-commit-id: befb72d65e
Former-commit-id: f0f10d8061 [formerly c13b5959e9]
Former-commit-id: 8f0a23c91b
 2014-03-25 12:13:29 -05:00
Nate Jensen
2d08cd2ec7 Merge "Issue #2935 fix refresh issue" into development 
Former-commit-id: 07c97d0fda [formerly 4fe0db7411] [formerly 07c97d0fda [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]
Former-commit-id: 21d448c0bc
Former-commit-id: 33c20da77f [formerly c726dd0589]
Former-commit-id: ead4e7833c
 2014-03-25 11:25:38 -05:00
Mike Duff
7705874ea3 Issue #2938 - Show status message for site/role changes, but not return from away 
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 758fdca514 [formerly 1e42d8a30d] [formerly 758fdca514 [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]
Former-commit-id: a06f058ea9
Former-commit-id: 81ac35a1b8 [formerly d497c533e6]
Former-commit-id: 97c4e48255
 2014-03-25 11:18:09 -05:00
Greg Armendariz
8f54660efa Merge "Issue #2851 - 64-bit Windows Jep DLL" into development 
Former-commit-id: a628c811ec [formerly e8e90ff576] [formerly a628c811ec [formerly e8e90ff576] [formerly 035029851a [formerly 4729ae8efbd4ada965c45a67540349cd58a4b543]]]
Former-commit-id: 035029851a
Former-commit-id: fa2e5c0546 [formerly 8d2ad9c43a]
Former-commit-id: 386804aa8e
 2014-03-25 10:45:18 -05:00
Bryan Kowal
8c8a0539ce Issue #2851 - 64-bit Windows Jep DLL 
cots/org.jep.win64/jep.dll: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: a758bbdfaa [formerly 5871d767db] [formerly a758bbdfaa [formerly 5871d767db] [formerly 1feefeb41b [formerly c03701dbe9e78dcd72a08a579329be9b4408295f]]]
Former-commit-id: 1feefeb41b
Former-commit-id: 278ff3c00a [formerly a02cf1f5df]
Former-commit-id: 116711b64f
 2014-03-25 10:27:53 -05:00
Nate Jensen
8e3b78ba6a Issue #2935 fix refresh issue 
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: d1f080fd05 [formerly 68f9181340] [formerly d1f080fd05 [formerly 68f9181340] [formerly 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 447b1a36bb [formerly 0cad1fa167]
Former-commit-id: a5b0c8b432
 2014-03-25 10:24:11 -05:00
Nate Jensen
ef30c5f9c8 Merge "Issue #2954 - Handle missing scale files at cave startup." into development 
Former-commit-id: e64401eedf [formerly d11a2dd96b] [formerly e64401eedf [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: 476e4df3ff [formerly 68298da133]
Former-commit-id: 82f9b6a092
 2014-03-25 08:37:55 -05:00
Mike Duff
e33813eef9 Issue #2954 - Handle missing scale files at cave startup. 
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 39cb0ac9e3 [formerly 372e9dc80f] [formerly 39cb0ac9e3 [formerly 372e9dc80f] [formerly 9334bc2b00 [formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]]]
Former-commit-id: 9334bc2b00
Former-commit-id: fb0073c74b [formerly 6de201d3f8]
Former-commit-id: 9c80493102
 2014-03-24 16:38:38 -05:00
Lee Venable
edcb08e4fe Issue #2951 - added dispose checks for runAsync calls. 
Former-commit-id: 4afcc659a2 [formerly f5c4414c72] [formerly 4afcc659a2 [formerly f5c4414c72] [formerly c2d52987f8 [formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]]]
Former-commit-id: c2d52987f8
Former-commit-id: 2575b680d1 [formerly d0ec74f4b7]
Former-commit-id: 464ae77609
 2014-03-24 16:14:49 -05:00
Nate Jensen
d207333ed5 Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development 
Former-commit-id: 0fa5b14762 [formerly 5df9be36da] [formerly 0fa5b14762 [formerly 5df9be36da] [formerly a47c32f4b9 [formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]]]
Former-commit-id: a47c32f4b9
Former-commit-id: b0616edf0e [formerly 2d97ef8631]
Former-commit-id: 92bf5f5075
 2014-03-24 15:59:20 -05:00
Mike Duff
9075ec61a0 Issue #2936 - Remove the join alert from the nws collaboration feed 
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: eacc161ee4 [formerly fd31ea7fa5] [formerly eacc161ee4 [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]
Former-commit-id: ca27ceac1f
Former-commit-id: 86fc8d74d5 [formerly fc7a71889c]
Former-commit-id: a1661a5389
 2014-03-24 14:59:33 -05:00
Nate Jensen
5b6683bd56 Issue #2868 plot delegate python now uses PythonCoordinatorJob API, 
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: 2418c9bdfe [formerly fe33896e7e] [formerly 2418c9bdfe [formerly fe33896e7e] [formerly c4beb293b9 [formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]
Former-commit-id: c4beb293b9
Former-commit-id: 0acb4621f9 [formerly 774091461c]
Former-commit-id: 96339798b5
 2014-03-24 14:59:31 -05:00
Lee Venable
ca68a98f36 Issue #1426 - fixed arrow buttons and simplified the code. 
Former-commit-id: 75504da2bc [formerly 702ebe6881] [formerly 75504da2bc [formerly 702ebe6881] [formerly 4c80552979 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]]]
Former-commit-id: 4c80552979
Former-commit-id: 5b0f8f631f [formerly 18de63886c]
Former-commit-id: 3af5936abd
 2014-03-24 14:08:49 -05:00
Ben Steffensmeier
77d809f66a Issue #2874 Initial implementation of RTOFS data. 
Former-commit-id: 1c18e800b3 [formerly 55046a8e1e] [formerly 1c18e800b3 [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: aadc22091e [formerly ab8293c6a1]
Former-commit-id: d20a1a6f54
 2014-03-24 11:10:18 -05:00
Richard Peter
631aa74a10 Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1 
Former-commit-id: 6236137635 [formerly 390e73af44] [formerly 6236137635 [formerly 390e73af44] [formerly 897980da08 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]]]
Former-commit-id: 897980da08
Former-commit-id: a910870531 [formerly 780b504251]
Former-commit-id: 9060aab6dd
 2014-03-24 09:53:13 -05:00
Dave Hladky
a37f87968c Issue #2939 Madis data mismatches 
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 39343e1801 [formerly 3ac04dd071] [formerly 39343e1801 [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: e464a1d8f8 [formerly 43cbcff538]
Former-commit-id: 3d61ca32f6
 2014-03-24 08:27:12 -05:00
Mike Duff
05fbcc61ca Issue #2941 - Sort data before returning 
Former-commit-id: ff07b90659 [formerly 73a011b940] [formerly ff07b90659 [formerly 73a011b940] [formerly 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]]]
Former-commit-id: 4db73e42a5
Former-commit-id: 8d1347d1f7 [formerly 43eccead7c]
Former-commit-id: 8f00b37688
 2014-03-24 08:19:21 -05:00
Brian.Dyke
aea0544eec Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 50e5f4f78d [formerly 06ee9a6384] [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: d97b88f433 [formerly 14567f20a7]
Former-commit-id: f540c6fb2d
 2014-03-24 07:01:29 -04:00
Slav Korolev
54e1c39279 Issue #2652. Fixed issue with edex-text-ingest log. Corrected. 
Change-Id: I0064146b6b6d1c05955f513ab9eda9b6ba03de76

Former-commit-id: c730d58f6c [formerly 4786aa382b] [formerly c730d58f6c [formerly 4786aa382b] [formerly 88fbcc2ca6 [formerly dd0660d1b51aef2e3e703fd21c0f1d98f3484fbc]]]
Former-commit-id: 88fbcc2ca6
Former-commit-id: 84d8d13da7 [formerly c6f98da81c]
Former-commit-id: 49bd53ef7c
 2014-03-21 15:25:51 -04:00
Lee Venable
f160e66a85 Issue #2925 - Fixed NPE found during testing. 
Former-commit-id: cc7d240cfd [formerly c29981fa99] [formerly cc7d240cfd [formerly c29981fa99] [formerly 5b73c516d3 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 05a4c4e31b [formerly f08d4a827f]
Former-commit-id: 2384cc90c0
 2014-03-21 12:42:13 -05:00
Brian.Dyke
7aeb9af309 OB_14.1.1-24 baseline 
Former-commit-id: 37e9d48d45 [formerly 37b6368268] [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: cfa058a345 [formerly 6b2175da93]
Former-commit-id: 2fda566cfb
 2014-03-21 12:43:50 -04:00
Richard Peter
c3e96872f1 Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development 
Former-commit-id: fa801ee21e [formerly e766c3b5bf] [formerly fa801ee21e [formerly e766c3b5bf] [formerly b87cb91164 [formerly f3ed4ac03fd902909d027e576245ebb47c4d69b3]]]
Former-commit-id: b87cb91164
Former-commit-id: dae6dcd9fa [formerly 1777bc667c]
Former-commit-id: 8b0b197a79
 2014-03-21 10:23:08 -05:00
Nate Jensen
bb0d7ba73d Merge "Issue #2688 Return value from subprocess.check_output is not return code, but is process output. Updated check for success." into development 
Former-commit-id: 1765aa8d1b [formerly 28ddcc3883] [formerly 1765aa8d1b [formerly 28ddcc3883] [formerly c14a1e2952 [formerly 134dae207d8f8ec28b355760ec79ce76ac009b82]]]
Former-commit-id: c14a1e2952
Former-commit-id: 54110899c5 [formerly b1dbc1a6ae]
Former-commit-id: 3903eb195c
 2014-03-21 09:03:21 -05:00