Bryan Kowal
|
7ec6eb66ab
|
Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 35aff16e89 [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]
Former-commit-id: 3e1556a981
Former-commit-id: a34225c4c9
|
2012-09-05 14:44:36 -05:00 |
|
Bryan Kowal
|
8d64fdba2c
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: f92eb59a73
Former-commit-id: 580172b47c
|
2012-07-10 16:57:16 -05:00 |
|
Bryan Kowal
|
b4917e6708
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
333fd9c64e
|
Revert "12.6.1-10 baseline"
This reverts commit f8497470fc [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].
Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
f8497470fc
|
12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
7ac868e3c7
|
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: ad13e81ea6 [formerly d20417a793] [formerly a828d869a0 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]
Former-commit-id: a828d869a0
Former-commit-id: 916ce42ff8
|
2012-06-20 14:47:19 -05:00 |
|
Steve Harris
|
b69fa75919
|
12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
32c0464d79
|
12.6.1-3 baseline
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: d57eb02b9e
Former-commit-id: 1fdc0aa237
|
2012-06-11 16:23:47 -05:00 |
|
Bryan Kowal
|
cbe0691efd
|
Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished.
Former-commit-id: 38f61f4a73 [formerly ea8bf623cf] [formerly fbb694b48e [formerly b831809423f9aa6e1da5678f2653fa52d928c132]]
Former-commit-id: fbb694b48e
Former-commit-id: f7cba22ee2
|
2012-05-10 09:24:56 -05:00 |
|
Steve Harris
|
9c9e01dbda
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 58037cb5d1
Former-commit-id: 63ea8599d7
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
f6300cd995
|
12.5.1-2 baseline
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
33a67cdd82
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
|
2012-05-01 18:06:13 -05:00 |
|
Bryan Kowal
|
fb02245232
|
Issue #453 - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm.
Former-commit-id: 51688bb591 [formerly fadb50446d] [formerly 298ab2e057 [formerly 5afc6ff942850e0781da96bdeaa1fb4ee7d54000]]
Former-commit-id: 298ab2e057
Former-commit-id: 62e4e0bbea
|
2012-04-16 17:00:30 -05:00 |
|
Steve Harris
|
8bc60b1e32
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
|
2012-03-30 08:38:33 -05:00 |
|
Bryan Kowal
|
f046b941ba
|
Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
Former-commit-id: d4142689c9 [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]
Former-commit-id: c803afd454
Former-commit-id: 033a4e237b
|
2012-03-07 10:22:40 -06:00 |
|
Steve Harris
|
b55a488ed8
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
9f6780c4dd
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 4453ad2d10 [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: ea1c82452b
Former-commit-id: 7f1b468010
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
Bryan Kowal
|
281be5e0b7
|
Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 63f6f44fe1 [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]
Former-commit-id: 9d64e1df12
Former-commit-id: 06187b93be
|
2012-01-18 16:00:45 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|