Rainer Gerhards
e02132f101
Merge pull request #88 from chewi/master
...
fix broken PostgreSQL database creation
2014-06-13 18:43:59 +02:00
James Le Cuirot
ee54d0e4dc
fix broken PostgreSQL database creation
...
Quoting is really really important under PostgreSQL. Giving the
database name in single quotes simply won't work. Giving it in double
quotes is not the same as not quoting it at all. rsyslog has
traditionally connected case-sensitively to "Syslog" but accessed the
tables case-insensitively so we should follow suit here.
Furthermore, you cannot create a table based on template1 with a
different encoding. template0 must be used instead.
2014-06-13 17:20:50 +01:00
Rainer Gerhards
f53e374f3f
Merge branch 'v8-stable'
2014-06-08 16:51:24 +02:00
theinric
3becbeb9dc
imrelp: Clear KeepAlive* params for new instance
2014-06-08 16:50:38 +02:00
Rainer Gerhards
c62acb81af
Merge branch 'v8-stable'
2014-06-04 15:35:55 +02:00
Rainer Gerhards
de74860c17
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
tools/syslogd.c
2014-06-04 15:35:46 +02:00
Rainer Gerhards
4f936073cc
place some more code under ASL 2.0
...
Note:
* Yann Droneaud contribution to this code has been removed
with this commit
* mono_matsuko contribution was already removed by previous
commits
The rest was my own code.
2014-06-04 15:28:51 +02:00
Rainer Gerhards
6757ec6dd4
make rsyslogd -v output work in regard to 64 bit atomic buildin info
2014-06-04 15:25:29 +02:00
Rainer Gerhards
48125c7ce2
remove contribution from mono_matsuko
...
we could not reach him to agree to the re-licensing to ASL 2.0.
So I remove his contribution, which means we do no longer need
has agreement. This was the original contribution:
http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=fb7fab511e0de2566c0de47468b443ef5bb508d3
Note that the bug is now introduced again. We will fix it via a
different method in the next commit.
2014-06-04 15:18:50 +02:00
Rainer Gerhards
c9fdfce3d6
Merge branch 'v8-stable'
...
Conflicts:
ChangeLog
configure.ac
2014-06-02 13:02:55 +02:00
Rainer Gerhards
c8854aefad
prepare for 8.2.2 release
2014-06-02 12:42:29 +02:00
Rainer Gerhards
9016c24fb3
fix make dist: header file gone away some commits ago
2014-06-02 12:42:08 +02:00
Rainer Gerhards
4c05bcdb94
Merge branch 'v8-stable'
2014-06-02 12:14:59 +02:00
Rainer Gerhards
17f01c2e62
testbench: disable currently not supported test
2014-06-02 12:14:39 +02:00
Rainer Gerhards
05d31f5a3b
Merge branch 'v8-stable'
2014-06-01 10:47:17 +02:00
Rainer Gerhards
92ff191226
Merge branch 'v7-stable' into v8-stable
2014-05-31 12:11:08 +02:00
Rainer Gerhards
324fdd7165
Merge branch 'v8-stable'
2014-05-30 13:57:29 +02:00
Rainer Gerhards
151eded4b8
Merge branch 'tmp' into v8-stable
2014-05-30 13:57:14 +02:00
Rainer Gerhards
01ab68f4e5
improve debug log in regard to max message size
2014-05-30 13:56:51 +02:00
Rainer Gerhards
1c1d634228
fix: imtcp, imgssapi did not always pick up configured max message size
2014-05-29 17:36:33 +02:00
Rainer Gerhards
d20e7425dc
Merge branch 'v8-stable'
2014-05-28 14:29:41 +02:00
Rainer Gerhards
46a92c5e8e
Merge branch 'v7-stable' into v8-stable
2014-05-28 14:29:32 +02:00
Rainer Gerhards
0e3813c6e1
nitfix in testbench
2014-05-28 14:13:16 +02:00
Rainer Gerhards
26a4aee296
fix regression in config validation run
...
bug was in no released version
2014-05-28 14:05:44 +02:00
Rainer Gerhards
17710e47da
better diagnostic message
2014-05-28 13:06:37 +02:00
Rainer Gerhards
68307718c1
Merge branch 'v8-stable'
2014-05-28 12:13:40 +02:00
Rainer Gerhards
93cf514504
Merge branch 'v7-stable' into v8-stable
2014-05-28 12:13:27 +02:00
Rainer Gerhards
e7e03eb7cc
Merge remote-tracking branch 'github/v7-stable' into v7-stable
2014-05-28 12:13:00 +02:00
Rainer Gerhards
8e81842a4d
fix compiler warnings on 64bit platforms
2014-05-28 12:12:31 +02:00
Rainer Gerhards
f20537627f
Merge remote-tracking branch 'github/v7-stable' into v7-stable
2014-05-28 12:00:09 +02:00
Rainer Gerhards
78bc3a706b
fix build problem on debian
2014-05-28 11:59:03 +02:00
Rainer Gerhards
8b326647d2
cleanup
2014-05-28 11:54:23 +02:00
Rainer Gerhards
da2dac0385
cleanup
2014-05-27 15:56:23 +02:00
Rainer Gerhards
528d86f8fc
Merge branch 'v8-stable'
...
Conflicts:
tools/syslogd.c
2014-05-27 15:51:30 +02:00
Rainer Gerhards
cef5a3a7d1
Merge branch 'v7-stable' into v8-stable
2014-05-27 15:42:45 +02:00
Rainer Gerhards
3cab204a3f
relicense
...
ok from copyright holders: me, Red Hat, Canonical
2014-05-27 15:41:30 +02:00
Rainer Gerhards
831d6199e4
Merge branch 'v8-stable'
2014-05-27 13:10:48 +02:00
Rainer Gerhards
0c60fc158d
Merge branch 'v7-stable' into v8-stable
2014-05-27 13:10:37 +02:00
Rainer Gerhards
89b387c7a5
relicense auxiluary file
...
it's not even a real rsyslog part...
I am the sole author.
2014-05-27 13:03:47 +02:00
Rainer Gerhards
7106ec424d
relicens
...
authors only Rainer Gerhards and Bojan Smojver, who gave
permission to relicense via mail on 2014-05-22.
2014-05-27 12:58:59 +02:00
Rainer Gerhards
adab30bc64
cleanup
2014-05-27 12:55:41 +02:00
Rainer Gerhards
1831850f34
relicensing
...
only Adiscon authors
2014-05-27 12:53:09 +02:00
Rainer Gerhards
8551e29d51
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
tools/syslogd.c
2014-05-27 12:46:28 +02:00
Rainer Gerhards
c28fcc35ed
cleanup
2014-05-27 12:35:19 +02:00
Rainer Gerhards
5b1795aa15
relicense
...
own code + contribs from Red Hat, for which permision
to relicense exists (email 2014-05-27).
2014-05-27 12:28:40 +02:00
Rainer Gerhards
35457fbdc6
cleanup
2014-05-27 12:26:05 +02:00
Rainer Gerhards
fabed7328c
relicense some of my own code under ASL 2.0
2014-05-27 12:19:27 +02:00
Rainer Gerhards
48a5079cb7
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
tools/syslogd.c
2014-05-27 12:02:40 +02:00
Rainer Gerhards
52aae5928f
refactor shutdown
...
also relicensing some of my own code under ASL 2.0
2014-05-27 11:58:56 +02:00
Rainer Gerhards
7ef891db8e
relicense some of my own code under ASL 2.0
2014-05-27 11:39:00 +02:00
