Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge some of 1.7 features to master #701

Merged
merged 342 commits into from
Mar 18, 2016
Merged

Merge some of 1.7 features to master #701

merged 342 commits into from
Mar 18, 2016

Conversation

michalwski
Copy link
Contributor

This PR includes:

erszcz and others added 30 commits January 28, 2016 15:18
@erszcz
Implement mod_auth_token:{serialize,deserialize}/1
1a5ab46
@erszcz
Mock required infrastructure
5da24e3
@erszcz
Silence redundant test printouts
4ca4c1e
@erszcz
Generate tokens in a top-down depth-first fashion
02e06d4
@erszcz
Properly extract user's domain
0f26319
@erszcz
Convert JID to binary when serializing
ec212b5
@erszcz
Base64 the token for transport layer
74bf893
@erszcz
Add missing async_helper for test suites
1d68590
@astachurski @erszcz
fixes for serialization logic and tests
702ea54
@astachurski @erszcz
changes in base64 conversions and jlib username conversions
246cd48
@astachurski @erszcz
handled return of refrsh token via sasl
61b2530
@erszcz
Clean up mod_auth_token
06b8f5c
@erszcz
Export datetime_to_seconds/1 and vice versa for tests
31553f8
@erszcz
Clean up auth_tokens_SUITE
2b81444
@erszcz
Remove props which were just design guidelines
3bb6e53
@erszcz
Spec mod_auth_token
f9bb628
@erszcz
Remove unused functions
58ad24b
@erszcz
Use the relevant namespace for returned tokens
2f4cb30
@erszcz
Make Dialyzer happy
d8a5e35
@erszcz
Add missing start/stop specs
baced3a
@astachurski @erszcz
modified type of token being returned to access
b9bb5e4
@erszcz
Fix indentation
dbb97d5
@erszcz
Prepare validate_token for plugging in revocation check
8e34854
@erszcz
Introduce mod_auth_token_odbc stub for persistent token info storage
eada2de
@erszcz
Test revoked token validation
745e314
@erszcz
Provide more information on token validation
5db8557
@erszcz
Add missing mod_auth_token_odbc.erl
fa9ddfd
@astachurski @erszcz
wip: implementing mod_auth_token_odbc
f2381b1
@erszcz
Fix whitespace
ec37ae4
@erszcz
Implement mod_auth_token_odbc:get_valid_sequence_number/1
d9e0a69
erszcz and others added 28 commits March 11, 2016 15:35
@erszcz
Print out what's happening
9f1965e
@erszcz
install: Redirect to stderr not fd/2
7b1d776
@erszcz
Don't forget to install LOCK_DIR
7dbef5f
@jenkins-ci-tags @erszcz
changed /dev/stderr to &2
fc83075
@erszcz
Make mongooseimctl to also run as RUNNER_USER
cd15d63
@erszcz
Refer to epmd via a complete path
87e3dca
@erszcz
Print pid along with version in server status
638aed9
@erszcz
Reformat mongooseimctl status output for scripting
d853811
@erszcz
Require rel/vars.config to be present for DEVNODES
71b8193
@erszcz
Use POSIX '.' instead of bash-only 'source' builtin
d3bd388
@erszcz
Make sure tools/configure includes an app and all its deps
5088d67
@michalwski
do not specify RUNNER_USER by default
cb25efd
@erszcz
[skip ci] Don' error out from test-install if the TARGET or config fi…
011501a 
…les don't yet exist

(cherry picked from commit b0b02c5)
@michalwski
change wait_untils_stopped/started in distributed_helper
7c4f494
@michalwski
increase backlog to 100 and restore passing options from cfg file
bf63eff 
default backlog value which is 5 is too low on MacOS X to successfully
run parallel tests, also it was discovered that passing sockert options
from config file stopped working
thanks @pzel for helping me with this
@michalwski
add test checking default backlog and passed from config
b1b88bb
@michalwski
fix single = in comparison in travis-test.sh
66ccdbe
@michalwski
[skip ci] add backlog parameter to ejabberd_c2s listener doc
4e56dcc
@michalwski
make socket opts overriding more explicit
01e494a
@michalwski
test default backlog and override in different test cases
4b8e9d6
@michalwski
[test] add started and stopped commands
61f3462 
to make sure we move forwared only if node started/stopped
@pzel
Merge pull request #708 from esl/fix-tcp-opts-passing-to-listener
456c90b 
TCP backlog improvements
@michalwski
check node status by mongooseim ping in clusterm_commands_SUITE
e74cf63
@michalwski
[skip ci] update README file
496d56a
@michalwski
[skip ci] add tools/configure doc
aa914f9
@michalwski
Merge branch 'master' into rel-1.7
4e882f4
@michalwski
fix make clean command
8e380ed
@michalwski
[skip ci] update CHANGELOG
61b30b5
michalwski added a commit that referenced this pull request Mar 18, 2016
@michalwski
Merge pull request #701 from esl/rel-1.7
3170173 
Merge some of 1.7 features to master
@michalwski michalwski merged commit 3170173 into master Mar 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@michalwski @erszcz @astachurski @pzel @jenkins-ci-tags