Steve Harris
7e48d3e684
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1
]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf
13.3.1-1 baseline
...
Former-commit-id: e0406d3183
[formerly 8ae397085e
] [formerly 71e8990021
] [formerly d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4
]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Bryan Kowal
f8e120a219
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: 7b4935a0ef
[formerly ec584b4d4b
] [formerly ff34587e94
] [formerly 54697ff658
[formerly ff34587e94
[formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]]
Former-commit-id: 54697ff658
Former-commit-id: 32df1491d555132dea478823ea8d5513fb36a0d5 [formerly 0cf405d8d9
]
Former-commit-id: 45dd0b02ff
2013-01-28 11:21:24 -06:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79
]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Richard Peter
9da3b7e2dd
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 4e1f66abb3
[formerly ae3ea75cbf
] [formerly 1318f53902
] [formerly b8e42dabc0
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038
]
Former-commit-id: fa6247baf7
2013-01-14 17:38:38 -06:00
Steve Harris
13be9f8987
13.1.2-8 baseline
...
Former-commit-id: 5aaacf4eec
[formerly b864fdc303
] [formerly e6217a17de
] [formerly 06b8eb8db0
[formerly e6217a17de
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83
]
Former-commit-id: 7d0109a349
2013-01-11 16:19:07 -05:00
Bryan Kowal
f8df1139b2
Issue #1416 : added the python package shapely
...
- shapely and dependencies will now be built as part of the
32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
MSFT Windows environment
Former-commit-id: efe8f338b0
[formerly ef0b12813d
] [formerly 8d1e29448a
] [formerly 5e22c24657
[formerly 8d1e29448a
[formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]
Former-commit-id: 5e22c24657
Former-commit-id: 6b0159b5868c1e9370ac2d621cc75a1b66d8575f [formerly 6103e7c485
]
Former-commit-id: 976834171e
2012-12-17 15:27:43 -06:00
Bryan Kowal
10960c5d62
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds
Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396
Former-commit-id: 8d50e95643
[formerly 7fb4e993e6
] [formerly 660a9b615f
] [formerly f39489c44c
[formerly 660a9b615f
[formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]
Former-commit-id: f39489c44c
Former-commit-id: edcca021807dc76971231ad55a5724539778b5ee [formerly c44c4bd061
]
Former-commit-id: 8579adf932
2012-12-16 21:40:26 -06:00
Richard Peter
785b6c7bfe
Revert "Issue #1262:"
...
This reverts commit 333e7ab7d4
[formerly bad53d1b7f
] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103
]] [formerly 0970259114
] [formerly 2f31d21ac3
[formerly c3da463f39
] [formerly a210f08acc
] [formerly 0970259114
[formerly a210f08acc
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]
Former-commit-id: 80a95c53ba
[formerly 9d03a53fb5
] [formerly 9a7cfa2383
] [formerly f37f948456
[formerly 9a7cfa2383
[formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]
Former-commit-id: f37f948456
Former-commit-id: efeeaf09bb60e407eb7f16418882f2261396e41e [formerly 48641ca26f
]
Former-commit-id: 2100b136a9
2012-12-16 20:37:21 -06:00
Bryan Kowal
333e7ab7d4
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: 2f31d21ac3
[formerly c3da463f39
] [formerly a210f08acc
] [formerly 0970259114
[formerly a210f08acc
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]
Former-commit-id: 0970259114
Former-commit-id: 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103
]
Former-commit-id: bad53d1b7f
2012-12-13 12:40:31 -06:00
Steve Harris
4300583fc2
12.12.1-4 baseline
...
Former-commit-id: b968ab5135
[formerly b91b7f0fae
] [formerly 85130eb611
] [formerly 57578da521
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6
]
Former-commit-id: e35a321a8c
2012-11-14 14:19:20 -06:00
Steve Harris
5365b72401
12.12.1-2 baseline
...
Former-commit-id: 7192b19284
[formerly ed809a02db
] [formerly a8560580f8
] [formerly 6868eb9b23
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed
]
Former-commit-id: 111e7607cf
2012-11-13 17:14:24 -06:00
Steve Harris
89940e8fed
12.11.1-12 baseline
...
Former-commit-id: 7f6baf2e24
[formerly 565756567f
] [formerly 8682e4f6ca
] [formerly 9ff9cb8aa3
[formerly 8682e4f6ca
[formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6
]
Former-commit-id: d8b6157aab
2012-10-29 12:15:56 -05:00
Steve Harris
ae73939b02
12.11.1-6 baseline
...
Former-commit-id: 58cd1e90f8
[formerly 30c786a885
] [formerly fba4a443a0
] [formerly 5c1f3cdc46
[formerly fba4a443a0
[formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14
]
Former-commit-id: 8beb6fc0b8
2012-10-18 15:53:01 -05:00
Steve Harris
dfdf01de85
12.11.1-5 baseline
...
Former-commit-id: bb8fe6e556
[formerly 362d6ffaca
] [formerly 03f3f3c36a
] [formerly a0eaf651ff
[formerly 03f3f3c36a
[formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba
]
Former-commit-id: 85ad066b70
2012-10-18 15:46:42 -05:00
Steve Harris
c9b563338a
12.11.1-4 baseline
...
Former-commit-id: 6e44abdba1
[formerly 98171b5de9
] [formerly d3497e47eb
] [formerly 6958b861f0
[formerly d3497e47eb
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce
]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Steve Harris
d5ec4edea1
12.10.1-6 baseline
...
Former-commit-id: dd922048c0
[formerly 81d91a8289
] [formerly ea3b8e2680937dc133fce53ac16b4f91b25d4bc7 [formerly cebe6534ae
]] [formerly ba648f8e72
[formerly cebe6534ae
[formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75
]
Former-commit-id: 0e77eb2fe2
2012-09-25 10:14:23 -05:00
Steve Harris
64699fa90b
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9
[formerly de1639aea2
] [formerly 21f430062b
] [formerly 969e7e6dfd
[formerly 21f430062b
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd
]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
9f4fa7bf83
12.10.1-1 baseline
...
Former-commit-id: 7248f8b762
[formerly 0abf64b77c
] [formerly 195158c004
] [formerly d708932029
[formerly 195158c004
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7
]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
15fa63819d
12.9.1-12 baseline
...
Former-commit-id: 6784576fc9
[formerly 4bf4f0043a
] [formerly 948766c387
] [formerly 150bc967a5
[formerly 948766c387
[formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e
]
Former-commit-id: 782941ccc1
2012-09-04 11:47:38 -05:00
Steve Harris
c704490769
12.9.1-10 baseline
...
Former-commit-id: 264d870cbf
[formerly bdb45cdfae
] [formerly 3adc50a783
] [formerly cb9b80f3a0
[formerly 3adc50a783
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a
]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb
]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
e528bb0df2
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0
]
Former-commit-id: dc50bc8443
2012-07-10 07:53:49 -05:00
Steve Harris
1f521a70b3
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
13a3edd4f6
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 829d2791e9
[formerly 8da36046de
] [formerly c8aae98741
] [formerly 54be9660f1
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963
]
Former-commit-id: b55a488ed8
2012-02-22 11:14:43 -06:00
Bryan Kowal
69f4822ad1
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: d537df4ab0
[formerly 4453ad2d10
] [formerly 9a1c04ec5f94674baf45e393882ffe09f7582171 [formerly 65e1e4ee0b
]] [formerly ea1c82452b
[formerly 65e1e4ee0b
[formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]
Former-commit-id: ea1c82452b
Former-commit-id: e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010
]
Former-commit-id: 9f6780c4dd
2012-01-20 13:38:00 -06:00
Matt Nash
fa4cd88c90
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00
[formerly 1faae42484
]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
Bryan Kowal
f19cf1c4ee
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 48c7c3b950
[formerly 63f6f44fe1
] [formerly 43c3807a32
] [formerly 9d64e1df12
[formerly 43c3807a32
[formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]
Former-commit-id: 9d64e1df12
Former-commit-id: 9ceb347a77
[formerly 06187b93be
]
Former-commit-id: 281be5e0b7
2012-01-18 16:00:45 -06:00
root
9bb8decbcf
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9
[formerly 3360eb6c5f
]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00